From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 May 2008 08:46:04 +0000 (-0000)
Subject: Simplify code for derived Package attributes. (trunk r10266)
X-Git-Tag: v2.1.5~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f60138b704d094b97e1be8887e8db6c1eaa5ed0;p=portage.git

Simplify code for derived Package attributes. (trunk r10266)

svn path=/main/branches/2.1.2/; revision=10267
---

diff --git a/bin/emerge b/bin/emerge
index fc6a687a9..1cf8dd84e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1427,10 +1427,8 @@ class Package(Task):
 		self.cp = portage.cpv_getkey(self.cpv)
 		self.slot_atom = "%s:%s" % (self.cp, self.metadata["SLOT"])
 		self.cpv_slot = "%s:%s" % (self.cpv, self.metadata["SLOT"])
-		cpv_parts = portage.catpkgsplit(self.cpv)
-		self.category = cpv_parts[0]
-		self.pv_split = cpv_parts[1:]
-		self.pf = self.cpv.replace(self.category + "/", "", 1)
+		self.category, self.pf = portage.catsplit(self.cpv)
+		self.pv_split = portage.catpkgsplit(self.cpv)[1:]
 
 	def _get_hash_key(self):
 		hash_key = getattr(self, "_hash_key", None)