summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-12 18:41:39 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-12 18:41:39 +0000
commit5ecd101875bcceca468b0d4ab9a88d7379335a63 (patch)
tree5a2af6568c5de04c1144b5da983bb90410f132e9
parentea9101a93020e495c270841b3b24ab815da8fec9 (diff)
downloadportage-5ecd101875bcceca468b0d4ab9a88d7379335a63.tar.gz
portage-5ecd101875bcceca468b0d4ab9a88d7379335a63.tar.bz2
portage-5ecd101875bcceca468b0d4ab9a88d7379335a63.zip
Revert r3339 because r3301 makes it unnecessary. See bug #133055.
svn path=/main/trunk/; revision=3341
-rw-r--r--pym/portage.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py
index d10bf54a3..fb7679d59 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6601,9 +6601,6 @@ 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.