From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 13 Apr 2007 04:14:50 +0000 (-0000)
Subject: Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere. (trunk... 
X-Git-Tag: v2.1.2.4~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93b21fdc04bfc6b755e97fd6cfa2f033b94872f0;p=portage.git

Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere. (trunk r6383:6384)

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

diff --git a/pym/portage.py b/pym/portage.py
index ebf7e3463..23e70e49c 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4032,7 +4032,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 		for cpv in portdb.match(match_atom):
 			# only use new-style matches
 			if cpv.startswith("virtual/"):
-				pkgs[cpv] = (cpv, pkgsplit(cpv), portdb)
+				pkgs[cpv] = (cpv, catpkgsplit(cpv)[1:], portdb)
 		if kwargs["use_binaries"] and "vartree" in trees[myroot]:
 			vardb = trees[myroot]["vartree"].dbapi
 			for cpv in vardb.match(match_atom):
@@ -4040,7 +4040,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 				if cpv.startswith("virtual/"):
 					if cpv in pkgs:
 						continue
-					pkgs[cpv] = (cpv, pkgsplit(cpv), vardb)
+					pkgs[cpv] = (cpv, catpkgsplit(cpv)[1:], vardb)
 		if not (pkgs or mychoices):
 			# This one couldn't be expanded as a new-style virtual.  Old-style
 			# virtuals have already been expanded by dep_virtual, so this one