[gentoo-commits] portage r10852 - main/trunk/pym/portage

[gentoo-commits] portage r10852 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-30 00:18:56 +0000 (Mon, 30 Jun 2008)
New Revision: 10852

Modified:
   main/trunk/pym/portage/__init__.py
Log:
* Tweak conditionals in doebuild() to fix emerge --fetch breakage reported
  by Arfrever.

* Change a couple EMERGE_FROM conditionals to use the "returnpid" parameter
  instead.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2008-06-29 17:27:37 UTC (rev 10851)
+++ main/trunk/pym/portage/__init__.py	2008-06-30 00:18:56 UTC (rev 10852)
@@ -2940,7 +2940,7 @@
 		env=mysettings.environ()
 		keywords["opt_name"]="[%s]" % mysettings["PF"]
 
-	if "EMERGE_FROM" in mysettings:
+	if keywords.get("returnpid"):
 		# emerge handles logging externally
 		keywords.pop("logfile", None)
 
@@ -4166,7 +4166,7 @@
 # parse actionmap to spawn ebuild with the appropriate args
 def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0,
 	logfile=None, fd_pipes=None, returnpid=False):
-	if "EMERGE_FROM" not in mysettings and \
+	if not returnpid and \
 		(alwaysdep or "noauto" not in mysettings.features):
 		# process dependency first
 		if "dep" in actionmap[mydo]:
@@ -5317,7 +5317,9 @@
 		# unpack compile install`, we will try and fetch 4 times :/
 		need_distfiles = (mydo in ("fetch", "unpack") or \
 			mydo not in ("digest", "manifest") and "noauto" not in features)
-		if not ("EMERGE_FROM" in mysettings and mydo != "unpack") and \
+		emerge_skip_distfiles = "EMERGE_FROM" in mysettings and \
+			mydo not in ("fetch", "unpack")
+		if not emerge_skip_distfiles and \
 			need_distfiles and not fetch(
 			fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
 			if have_build_dirs:
@@ -5350,7 +5352,7 @@
 				return 1
 
 		# See above comment about fetching only when needed
-		if not ("EMERGE_FROM" in mysettings and mydo != "unpack") and \
+		if not emerge_skip_distfiles and \
 			not digestcheck(checkme, mysettings, "strict" in features):
 			return 1
 

-- 
gentoo-commits@lists.gentoo.org mailing list