Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere.
authorZac Medico <zmedico@gentoo.org>
Fri, 13 Apr 2007 04:14:18 +0000 (04:14 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 13 Apr 2007 04:14:18 +0000 (04:14 -0000)
svn path=/main/trunk/; revision=6384

pym/portage/__init__.py

index 50ef2cc1a10baffe055e15f9fb08b867c06c94bd..eab6fe5bad284188d150b85565326798c0880efc 100644 (file)
@@ -4085,7 +4085,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):
@@ -4093,7 +4093,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