| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-12 20:57:00 +0000 (Sun, 12 Oct 2008) |
| 3 |
New Revision: 11683 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Inside fetch(), don't call pkg_nofetch when in parallel-fetch mode since |
| 9 |
it will get call again later anyway. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-10-12 19:59:32 UTC (rev 11682) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-10-12 20:57:00 UTC (rev 11683) |
| 16 |
@@ -4068,16 +4068,21 @@ |
| 17 |
"ebuild's files must be downloaded" |
| 18 |
print "!!! manually. See the comments in" + \ |
| 19 |
" the ebuild for more information.\n" |
| 20 |
- ebuild_phase = mysettings.get("EBUILD_PHASE") |
| 21 |
- try: |
| 22 |
- mysettings["EBUILD_PHASE"] = "nofetch" |
| 23 |
- spawn(_shell_quote(EBUILD_SH_BINARY) + \ |
| 24 |
- " nofetch", mysettings) |
| 25 |
- finally: |
| 26 |
- if ebuild_phase is None: |
| 27 |
- mysettings.pop("EBUILD_PHASE", None) |
| 28 |
- else: |
| 29 |
- mysettings["EBUILD_PHASE"] = ebuild_phase |
| 30 |
+ if not parallel_fetchonly: |
| 31 |
+ # To spawn pkg_nofetch requires PORTAGE_BUILDDIR for |
| 32 |
+ # ensuring sane $PWD (bug #239560) and storing elog |
| 33 |
+ # messages. Therefore, calling code needs to ensure that |
| 34 |
+ # PORTAGE_BUILDDIR is already clean and locked here. |
| 35 |
+ ebuild_phase = mysettings.get("EBUILD_PHASE") |
| 36 |
+ try: |
| 37 |
+ mysettings["EBUILD_PHASE"] = "nofetch" |
| 38 |
+ spawn(_shell_quote(EBUILD_SH_BINARY) + \ |
| 39 |
+ " nofetch", mysettings) |
| 40 |
+ finally: |
| 41 |
+ if ebuild_phase is None: |
| 42 |
+ mysettings.pop("EBUILD_PHASE", None) |
| 43 |
+ else: |
| 44 |
+ mysettings["EBUILD_PHASE"] = ebuild_phase |
| 45 |
elif not filedict[myfile]: |
| 46 |
writemsg("Warning: No mirrors available for file" + \ |
| 47 |
" '%s'\n" % (myfile), noiselevel=-1) |
Archives