[gentoo-commits] portage r9626 - main/branches/2.1.2/bin

[gentoo-commits] portage r9626 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 07:20:59 +0000 (Sun, 30 Mar 2008)
New Revision: 9626

Modified:
   main/branches/2.1.2/bin/emerge
Log:
Bug #211365 - Use catpkgsplit() instead of pkgsplit() for a cpv.
(trunk r9625)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-03-30 07:14:24 UTC (rev 9625)
+++ main/branches/2.1.2/bin/emerge	2008-03-30 07:20:59 UTC (rev 9626)
@@ -608,7 +608,7 @@
 							self.portdb.xmatch("match-all",match))
 				else:
 					full_package = match
-					match        = portage.pkgsplit(match)[0]
+					match        = portage.cpv_getkey(match)
 
 				if full_package:
 					try:
@@ -3696,7 +3696,8 @@
 							myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
 				p.append(myprint)
 
-			mysplit = portage.pkgsplit(x[2])
+			mysplit = [portage.cpv_getkey(pkg_key)] + \
+				list(portage.catpkgsplit(pkg_key)[2:])
 			if "--tree" not in self.myopts and mysplit and \
 				len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \
 				x[1] == "/":
@@ -4453,8 +4454,8 @@
 					"--fetch-all-uri" not in self.myopts:
 
 					# Figure out if we need a restart.
-					mysplit=portage.pkgsplit(x[2])
-					if mysplit[0] == "sys-apps/portage" and x[1] == "/":
+					if myroot == "/" and \
+						portage.dep_getkey(pkg_key) == "sys-apps/portage":
 						if "livecvsportage" not in self.settings.features:
 							if len(mymergelist) > mergecount:
 								emergelog(xterm_titles,

-- 
gentoo-commits@lists.gentoo.org mailing list