From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Mar 2009 01:33:46 +0000 (-0000)
Subject: Make the --digest warning message show for FEATURES=digest.
X-Git-Tag: v2.2_rc24~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bae54798a42ab45909a3dfb38ca8e74aa9e28aa;p=portage.git

Make the --digest warning message show for FEATURES=digest.

svn path=/main/trunk/; revision=12796
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0b60e0fd2..df7db268d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14260,8 +14260,13 @@ def action_build(settings, trees, mtimedb,
 	if pretend or fetchonly:
 		# make the mtimedb readonly
 		mtimedb.filename = None
-	if "--digest" in myopts:
-		msg = "The --digest option can prevent corruption from being" + \
+	if '--digest' in myopts or 'digest' in settings.features:
+		if '--digest' in myopts:
+			msg = "The --digest option"
+		else:
+			msg = "The FEATURES=digest setting"
+
+		msg += " can prevent corruption from being" + \
 			" noticed. The `repoman manifest` command is the preferred" + \
 			" way to generate manifests and it is capable of doing an" + \
 			" entire repository or category at once."