diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-09 01:50:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-09 01:50:33 +0000 |
| commit | ee9daa0869866b7880dbfc5122924555444e12c2 (patch) | |
| tree | b9beb675c053985219cc06a3855b622b20695732 | |
| parent | 5bae54798a42ab45909a3dfb38ca8e74aa9e28aa (diff) | |
| download | portage-ee9daa0869866b7880dbfc5122924555444e12c2.tar.gz portage-ee9daa0869866b7880dbfc5122924555444e12c2.tar.bz2 portage-ee9daa0869866b7880dbfc5122924555444e12c2.zip | |
Bug #261675 - When doebuild() is called by emerge, don't call digestgen()
for FEATURES=digest because it's redundant and it can cause interference
with parallel-fetch and parallel builds.
svn path=/main/trunk/; revision=12797
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a8d55ca6b..66fc8d8bd 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5952,6 +5952,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, mycpv = "/".join((mysettings["CATEGORY"], mysettings["PF"])) emerge_skip_distfiles = returnpid + emerge_skip_digest = returnpid # Only try and fetch the files if we are going to need them ... # otherwise, if user has FEATURES=noauto and they run `ebuild clean # unpack compile install`, we will try and fetch 4 times :/ @@ -6008,7 +6009,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, elif mydo == "digest": return not digestgen(aalist, mysettings, overwrite=1, myportdb=mydbapi) - elif "digest" in mysettings.features: + elif not emerge_skip_digest and "digest" in mysettings.features: digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi) except portage.exception.PermissionDenied, e: writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1) |