Preserve the mysettings["SLOT"] for bug #129720.

svn path=/main/trunk/; revision=3146

diff --git a/pym/portage.py b/pym/portage.py
index 888a914ef9df207ad74ef12cd5fc3cb493480047..dfb26e2882f959fda31259c0c7ebdf9543dcca56 100644 (file)
--- 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: