summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-14 10:00:26 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-14 10:00:26 +0000
commit6ecb7943d09eee2f31fce8b194214a6cb61037e3 (patch)
treec52f6bf609a284e43f80af28f8f474e3b87c6ffd
parent5be662eb99f9036a8479e53bd6c7461e5508d278 (diff)
downloadportage-6ecb7943d09eee2f31fce8b194214a6cb61037e3.tar.gz
portage-6ecb7943d09eee2f31fce8b194214a6cb61037e3.tar.bz2
portage-6ecb7943d09eee2f31fce8b194214a6cb61037e3.zip
Preserve the mysettings["SLOT"] for bug #129720.
svn path=/main/trunk/; revision=3146
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 888a914ef..dfb26e288 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2238,6 +2238,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, t
if mysplit is None:
writemsg("!!! Error: PF is null '%s'; exiting.\n" % mypv)
return 1
+ slot = mysettings["SLOT"]
if mydo != "depend":
# XXX: We're doing a little hack here to curtain the gvisible locking
# XXX: that creates a deadlock... Really need to isolate that.
@@ -2245,6 +2246,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, t
mysettings.setcpv(mycpv,use_cache=use_cache)
mysettings["EBUILD_PHASE"] = mydo
+ mysettings["SLOT"] = slot
if debug: # Otherwise it overrides emerge's settings.
# We have no other way to set debug... debug can't be passed in
@@ -2292,8 +2294,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, t
else:
mysettings["PVR"]=mysplit[1]+"-"+mysplit[2]
- mysettings["SLOT"]=""
-
if mysettings.has_key("PATH"):
mysplit=string.split(mysettings["PATH"],":")
else: