summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 07:34:56 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 07:34:56 +0000
commit7e0021481b84d00b8192a6679fdd8c3d593d7c1f (patch)
tree0392fbe918f660920b5d45c075ea06f43d2a03f1
parentBug #261675 - Generate manifests in advance when FEATURES=digest is enabled. (diff)
downloadportage-multirepo-7e0021481b84d00b8192a6679fdd8c3d593d7c1f.tar.gz
portage-multirepo-7e0021481b84d00b8192a6679fdd8c3d593d7c1f.tar.bz2
portage-multirepo-7e0021481b84d00b8192a6679fdd8c3d593d7c1f.zip
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
-rw-r--r--pym/portage/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 06848450..ff86002f 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)