diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:56:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:56:44 +0000 |
| commit | d120565b8de77a325c9dc6d8d4eb7f3239f7ef19 (patch) | |
| tree | 6bd0cbee911c094b0dae4b9b6d6054d99624f6eb /pym | |
| parent | eae703d2db81790e98b6e7952f760200ca889ad1 (diff) | |
| download | portage-d120565b8de77a325c9dc6d8d4eb7f3239f7ef19.tar.gz portage-d120565b8de77a325c9dc6d8d4eb7f3239f7ef19.tar.bz2 portage-d120565b8de77a325c9dc6d8d4eb7f3239f7ef19.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. (trunk r12797)
svn path=/main/branches/2.1.6/; revision=13031
Diffstat (limited to 'pym')
| -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 b59c16f20..6f81318ac 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5942,6 +5942,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 :/ @@ -5998,7 +5999,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) |