From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 25 May 2011 00:29:27 +0000 (-0700)
Subject: PackageUninstall: remove extra cat/pf var init
X-Git-Tag: v2.2.0_alpha36~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53daf8dec6740d6c04e4dd76dd36d1cc19093c27;p=portage.git

PackageUninstall: remove extra cat/pf var init

Also, add to comments about ebuild-locks.
---

diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py
index 41409ba93..aebf55e98 100644
--- a/pym/_emerge/PackageUninstall.py
+++ b/pym/_emerge/PackageUninstall.py
@@ -18,7 +18,8 @@ class PackageUninstall(CompositeTask):
 	it is essential for the ebuild-locks code to execute in a
 	subprocess, since the portage.locks module does not behave
 	as desired if we try to lock the same file multiple times
-	concurrently from the same process.
+	concurrently from the same process for ebuild-locks phases
+	such as pkg_setup, pkg_prerm, and pkg_postrm.
 	"""
 
 	__slots__ = ("world_atom", "ldpath_mtimes", "opts",
@@ -66,7 +67,6 @@ class PackageUninstall(CompositeTask):
 			noiselevel=-1)
 		self._emergelog("=== Unmerging... (%s)" % (self.pkg.cpv,))
 
-		cat, pf = portage.catsplit(self.pkg.cpv)
 		unmerge_task = MergeProcess(
 			mycat=cat, mypkg=pf, settings=self.settings,
 			treetype="vartree", vartree=self.pkg.root_config.trees["vartree"],