From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 06:56:24 +0000 (-0000)
Subject: Make the --digest warning message show for FEATURES=digest. (trunk r12796)
X-Git-Tag: v2.1.6.8~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eae703d2db81790e98b6e7952f760200ca889ad1;p=portage.git

Make the --digest warning message show for FEATURES=digest. (trunk r12796)

svn path=/main/branches/2.1.6/; revision=13030
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 833f081ef..2fee53829 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13906,8 +13906,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."