From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 07:34:56 +0000 (-0000)
Subject: Never call digestgen() inside doebuild() which only 'fetch' has been
X-Git-Tag: v2.1.6.8~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e0021481b84d00b8192a6679fdd8c3d593d7c1f;p=portage.git

Never call digestgen() inside doebuild() which only 'fetch' has been
requested since it's not needed in this case. (trunk r12800)

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 068484501..ff86002f0 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5999,8 +5999,11 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			elif mydo == "digest":
 				return not digestgen(aalist, mysettings, overwrite=1,
 					myportdb=mydbapi)
-			elif not emerge_skip_digest and not parallel_fetchonly and \
+			elif mydo != 'fetch' and not emerge_skip_digest and \
 				"digest" in mysettings.features:
+				# Don't do this when called by emerge or when called just
+				# for fetch (especially parallel-fetch) since it's not needed
+				# and it can interfere with parallel tasks.
 				digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi)
 		except portage.exception.PermissionDenied, e:
 			writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)