From: Alec Warner <antarus@gentoo.org>
Date: Thu, 11 May 2006 19:46:01 +0000 (-0000)
Subject: Fix bug 113055, Binpkg's need SLOT in mysettings
X-Git-Tag: v2.1_rc1~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96f852643fe136c0f4476cbd923f22feb69004f3;p=portage.git

Fix bug 113055, Binpkg's need SLOT in mysettings

svn path=/main/trunk/; revision=3339
---

diff --git a/pym/portage.py b/pym/portage.py
index fb7679d59..d10bf54a3 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6601,6 +6601,9 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
 	origdir=getcwd()
 	os.chdir(pkgloc)
 
+	# Need slot for slot-based collision detection.
+	mysettings["SLOT"] = xptbz2.getfile("SLOT").strip()
+
 	mysettings.configdict["pkg"]["CATEGORY"] = mycat;
 	# Eventually we'd like to pass in the saved ebuild env here.
 	# Do cleanup=1 to ensure that there is no cruft prior to the setup phase.