Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere. (trunk...

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

diff --git a/pym/portage.py b/pym/portage.py
index ebf7e3463eb469a73d8cb6cee163e0db760a509d..23e70e49c5749d286005673a986cc31e075701ec 100644 (file)
--- 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