Make the --digest warning message show for FEATURES=digest. (trunk r12796)
authorZac Medico <zmedico@gentoo.org>
Wed, 11 Mar 2009 06:56:24 +0000 (06:56 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 11 Mar 2009 06:56:24 +0000 (06:56 -0000)
svn path=/main/branches/2.1.6/; revision=13030

pym/_emerge/__init__.py

index 833f081ef8af858763b9c98fdd547d38d97efb56..2fee5382933926563ff12340ad3017a4999d43c8 100644 (file)
@@ -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."