In fetch(), don't spawn pkg_nofetch unless PORTAGE_BUILDDIR exists since it

will die anyway due to the code for bug #239560 that's in ebuild.sh.

svn path=/main/trunk/; revision=11696

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 29251ddcdf4b9bfb4a713e76c28d30e052e44a4d..dfa445bce55d6bed2555a21a9664b420a4560437 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4078,7 +4078,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        (mysettings["CATEGORY"], mysettings["PF"])
                                portage.util.writemsg_level(msg,
                                        level=logging.ERROR, noiselevel=-1)
-                               if not parallel_fetchonly:
+                               have_builddir = "PORTAGE_BUILDDIR" in mysettings and \
+                                       os.path.isdir(mysettings["PORTAGE_BUILDDIR"])
+                               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