Bug #261675 - Generate manifests in advance when FEATURES=digest is enabled.

(trunk r12799)

svn path=/main/branches/2.1.6/; revision=13033

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2fee5382933926563ff12340ad3017a4999d43c8..1eed4a0e4fececb0c3796c21ac3a8fc3f4fc3acc 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14218,7 +14218,14 @@ def action_build(settings, trees, mtimedb,
                        # Convert Atom instances to plain str.
                        mtimedb["resume"]["favorites"] = [str(x) for x in favorites]
 
-                       if ("--digest" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts):
+                       digest = '--digest' in myopts
+                       if not digest:
+                               for pkgsettings in mydepgraph.pkgsettings.itervalues():
+                                       if 'digest' in pkgsettings.features:
+                                               digest = True
+                                               break
+
+                       if digest and '--fetchonly' not in myopts:
                                for pkgline in mydepgraph.altlist():
                                        if pkgline[0]=="ebuild" and pkgline[3]=="merge":
                                                y = trees[pkgline[1]]["porttree"].dbapi.findname(pkgline[2])