doebuild: fix emerge --fetchonly FEATURES=digest

This removes obsolete parallel-fetch code which is no longer needed,
since EbuildFetcher no longer calls doebuild.

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 8c265238d768c674112a0e2115689f9a16dfe744..6de47bb6bb5c73da03330cb600f3461164ceb126 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -588,9 +588,6 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
                fetchall = 1
                mydo = "fetch"
 
-       parallel_fetchonly = mydo in ("fetch", "fetchall") and \
-               "PORTAGE_PARALLEL_FETCHONLY" in mysettings
-
        if mydo not in clean_phases and not os.path.exists(myebuild):
                writemsg("!!! doebuild: %s not found for %s\n" % (myebuild, mydo),
                        noiselevel=-1)
@@ -837,8 +834,7 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
                # in order to satisfy the sane $PWD requirement (from bug #239560)
                # when pkg_nofetch is spawned.
                have_build_dirs = False
-               if not parallel_fetchonly and \
-                       mydo not in ('digest', 'fetch', 'help', 'manifest'):
+               if mydo not in ('digest', 'fetch', 'help', 'manifest'):
                        if not returnpid and \
                                'PORTAGE_BUILDDIR_LOCKED' not in mysettings:
                                builddir_lock = EbuildBuildDir(
@@ -979,11 +975,7 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
                                mf = None
                                _doebuild_manifest_cache = None
                                return not digestgen(mysettings=mysettings, myportdb=mydbapi)
-                       elif mydo != 'fetch' 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.
+                       elif "digest" in mysettings.features:
                                mf = None
                                _doebuild_manifest_cache = None
                                digestgen(mysettings=mysettings, myportdb=mydbapi)
@@ -992,14 +984,17 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
                        if mydo in ("digest", "manifest"):
                                return 1
 
+               if mydo == "fetch":
+                       # Return after digestgen for FEATURES=digest support.
+                       # Return before digestcheck, since fetch() already
+                       # checked any relevant digests.
+                       return 0
+
                # See above comment about fetching only when needed
                if tree == 'porttree' and \
                        not digestcheck(checkme, mysettings, "strict" in features, mf=mf):
                        return 1
 
-               if mydo == "fetch":
-                       return 0
-
                # remove PORTAGE_ACTUAL_DISTDIR once cvs/svn is supported via SRC_URI
                if tree == 'porttree' and \
                        ((mydo != "setup" and "noauto" not in features) \