projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ab97ef
)
Fix bug 113055, Binpkg's need SLOT in mysettings
author
Alec Warner
<antarus@gentoo.org>
Thu, 11 May 2006 19:46:01 +0000
(19:46 -0000)
committer
Alec Warner
<antarus@gentoo.org>
Thu, 11 May 2006 19:46:01 +0000
(19:46 -0000)
svn path=/main/trunk/; revision=3339
pym/portage.py
patch
|
blob
|
history
diff --git
a/pym/portage.py
b/pym/portage.py
index fb7679d59e7f6736e6ef9845b649f6ee8e8eeb9a..d10bf54a3737305952ac1635e47c5f03dd9e42c6 100644
(file)
--- 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.