diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-16 23:04:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-16 23:04:31 +0000 |
| commit | 01ca472a5a674702632000d850ea7cd1ec80c6c3 (patch) | |
| tree | a835d5dc1514c885401f5943ad84eeea741f2d6e /pym | |
| parent | 37a03b74e830e3ad18cbcab776121cdcf57ee8b8 (diff) | |
| download | portage-01ca472a5a674702632000d850ea7cd1ec80c6c3.tar.gz portage-01ca472a5a674702632000d850ea7cd1ec80c6c3.tar.bz2 portage-01ca472a5a674702632000d850ea7cd1ec80c6c3.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |