From 5ecd101875bcceca468b0d4ab9a88d7379335a63 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 May 2006 18:41:39 +0000 Subject: Revert r3339 because r3301 makes it unnecessary. See bug #133055. svn path=/main/trunk/; revision=3341 --- pym/portage.py | 3 --- 1 file changed, 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. -- cgit v1.2.3-1-g7c22