Remove pkg_nofetch code from the fetch() function since it's currently broken (doebui...

diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index 28ef7d074f12e635ec55c7f67c77ccb49b50fd5e..6d42b1fbb2ba970b4a0cca1d79948795b2f2720b 100644 (file)
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -193,19 +193,18 @@ class EbuildBuild(CompositeTask):
                self._start_task(build, self._build_exit)
 
        def _fetch_failed(self):
-               # If RESTRICT=fetch is set, then the nofetch phase
-               # should have been executed already, so don't do
-               # it again.
-               if 'fetch' in self.pkg.metadata.restrict or \
-               'nofetch' not in self.pkg.metadata.defined_phases:
+               # We only call the pkg_nofetch phase if either RESTRICT=fetch
+               # is set or the package has explicitly overridden the default
+               # pkg_nofetch implementation. This allows specialized messages
+               # to be displayed for problematic packages even though they do
+               # not set RESTRICT=fetch (bug #336499).
+
+               if 'fetch' not in self.pkg.metadata.restrict and \
+                       'nofetch' not in self.pkg.metadata.defined_phases:
                        self._unlock_builddir()
                        self.wait()
                        return
 
-               # The package has defined a pkg_nofetch phase, even
-               # though RESTRICT=fetch is not set, so go ahead and
-               # run it. This allows specialized messages to be
-               # displayed for problematic packages (bug #336499).
                self.returncode = None
                nofetch_phase = EbuildPhase(background=self.background,
                        phase='nofetch', scheduler=self.scheduler, settings=self.settings)

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index d5ad7f82762004e8423f4c31836fa83d56e72f2d..2c7f00703949a88b3597ae0401794b0de085503a 100644 (file)
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -1054,55 +1054,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        (mysettings["CATEGORY"], mysettings["PF"])
                                writemsg_level(msg,
                                        level=logging.ERROR, noiselevel=-1)
-                               have_builddir = "PORTAGE_BUILDDIR" in mysettings and \
-                                       os.path.isdir(mysettings["PORTAGE_BUILDDIR"])
-
-                               global_tmpdir = mysettings["PORTAGE_TMPDIR"]
-                               private_tmpdir = None
-                               if not parallel_fetchonly and not have_builddir:
-                                       # When called by digestgen(), it's normal that
-                                       # PORTAGE_BUILDDIR doesn't exist. It's helpful
-                                       # to show the pkg_nofetch output though, so go
-                                       # ahead and create a temporary PORTAGE_BUILDDIR.
-                                       # Use a temporary config instance to avoid altering
-                                       # the state of the one that's been passed in.
-                                       mysettings = config(clone=mysettings)
-                                       try:
-                                               private_tmpdir = tempfile.mkdtemp("", "._portage_fetch_.",
-                                                       global_tmpdir)
-                                       except OSError as e:
-                                               if e.errno != PermissionDenied.errno:
-                                                       raise
-                                               raise PermissionDenied(global_tmpdir)
-                                       mysettings["PORTAGE_TMPDIR"] = private_tmpdir
-                                       mysettings.backup_changes("PORTAGE_TMPDIR")
-                                       debug = mysettings.get("PORTAGE_DEBUG") == "1"
-                                       doebuild_environment(mysettings["EBUILD"], "fetch",
-                                               mysettings["ROOT"], mysettings, debug, 1, None)
-                                       prepare_build_dirs(mysettings["ROOT"], mysettings, 0)
-                                       have_builddir = True
-
-                               if not parallel_fetchonly and have_builddir:
-                                       # To spawn pkg_nofetch requires PORTAGE_BUILDDIR for
-                                       # ensuring sane $PWD (bug #239560) and storing elog
-                                       # messages. Therefore, calling code needs to ensure that
-                                       # PORTAGE_BUILDDIR is already clean and locked here.
-
-                                       # All the pkg_nofetch goes to stderr since it's considered
-                                       # to be an error message.
-                                       fd_pipes = {
-                                               0 : sys.stdin.fileno(),
-                                               1 : sys.stderr.fileno(),
-                                               2 : sys.stderr.fileno(),
-                                       }
-
-                                       try:
-                                               _doebuild_spawn("nofetch", mysettings, fd_pipes=fd_pipes)
-                                       finally:
-                                               if private_tmpdir is not None:
-                                                       shutil.rmtree(private_tmpdir)
-                                                       private_tmpdir = None
-
                        elif restrict_fetch:
                                pass
                        elif listonly: