From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 06:57:32 +0000 (-0000)
Subject: Bug #261675 - Generate manifests in advance when FEATURES=digest is enabled.
X-Git-Tag: v2.1.6.8~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2eaf1fe46193cf7374ed5c039977f7aaec1bd8e6;p=portage.git

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 2fee53829..1eed4a0e4 100644
--- 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])