From 01ca472a5a674702632000d850ea7cd1ec80c6c3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 16 Oct 2008 23:04:31 +0000 Subject: 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 --- pym/portage/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 29251ddcd..dfa445bce 100644 --- 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 -- cgit v1.2.3-1-g7c22