summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-05-11 19:46:01 +0000
committerAlec Warner <antarus@gentoo.org>2006-05-11 19:46:01 +0000
commit96f852643fe136c0f4476cbd923f22feb69004f3 (patch)
tree3f2e111184ddb00f8101188c07a0834daba1b745
parent2ab97ef0bc020f42508de4de62b4920931aaca20 (diff)
downloadportage-96f852643fe136c0f4476cbd923f22feb69004f3.tar.gz
portage-96f852643fe136c0f4476cbd923f22feb69004f3.tar.bz2
portage-96f852643fe136c0f4476cbd923f22feb69004f3.zip
Fix bug 113055, Binpkg's need SLOT in mysettings
svn path=/main/trunk/; revision=3339
-rw-r--r--pym/portage.py3
1 files changed, 3 insertions, 0 deletions
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.