| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-30 00:18:56 +0000 (Mon, 30 Jun 2008) |
| 3 |
New Revision: 10852 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
* Tweak conditionals in doebuild() to fix emerge --fetch breakage reported |
| 9 |
by Arfrever. |
| 10 |
|
| 11 |
* Change a couple EMERGE_FROM conditionals to use the "returnpid" parameter |
| 12 |
instead. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/pym/portage/__init__.py |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/pym/portage/__init__.py 2008-06-29 17:27:37 UTC (rev 10851) |
| 18 |
+++ main/trunk/pym/portage/__init__.py 2008-06-30 00:18:56 UTC (rev 10852) |
| 19 |
@@ -2940,7 +2940,7 @@ |
| 20 |
env=mysettings.environ() |
| 21 |
keywords["opt_name"]="[%s]" % mysettings["PF"] |
| 22 |
|
| 23 |
- if "EMERGE_FROM" in mysettings: |
| 24 |
+ if keywords.get("returnpid"): |
| 25 |
# emerge handles logging externally |
| 26 |
keywords.pop("logfile", None) |
| 27 |
|
| 28 |
@@ -4166,7 +4166,7 @@ |
| 29 |
# parse actionmap to spawn ebuild with the appropriate args |
| 30 |
def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0, |
| 31 |
logfile=None, fd_pipes=None, returnpid=False): |
| 32 |
- if "EMERGE_FROM" not in mysettings and \ |
| 33 |
+ if not returnpid and \ |
| 34 |
(alwaysdep or "noauto" not in mysettings.features): |
| 35 |
# process dependency first |
| 36 |
if "dep" in actionmap[mydo]: |
| 37 |
@@ -5317,7 +5317,9 @@ |
| 38 |
# unpack compile install`, we will try and fetch 4 times :/ |
| 39 |
need_distfiles = (mydo in ("fetch", "unpack") or \ |
| 40 |
mydo not in ("digest", "manifest") and "noauto" not in features) |
| 41 |
- if not ("EMERGE_FROM" in mysettings and mydo != "unpack") and \ |
| 42 |
+ emerge_skip_distfiles = "EMERGE_FROM" in mysettings and \ |
| 43 |
+ mydo not in ("fetch", "unpack") |
| 44 |
+ if not emerge_skip_distfiles and \ |
| 45 |
need_distfiles and not fetch( |
| 46 |
fetchme, mysettings, listonly=listonly, fetchonly=fetchonly): |
| 47 |
if have_build_dirs: |
| 48 |
@@ -5350,7 +5352,7 @@ |
| 49 |
return 1 |
| 50 |
|
| 51 |
# See above comment about fetching only when needed |
| 52 |
- if not ("EMERGE_FROM" in mysettings and mydo != "unpack") and \ |
| 53 |
+ if not emerge_skip_distfiles and \ |
| 54 |
not digestcheck(checkme, mysettings, "strict" in features): |
| 55 |
return 1 |
| 56 |
|
| 57 |
|
| 58 |
-- |
| 59 |
gentoo-commits@l.g.o mailing list |
Archives