From ebf8c9310bba13af7048ef427a889777749fa640 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 13 Apr 2007 04:14:18 +0000 Subject: [PATCH] Use catpkgsplit instead of pkgsplit for consistency with usage elsewhere. svn path=/main/trunk/; revision=6384 --- pym/portage/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 50ef2cc1a..eab6fe5ba 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -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 -- 2.26.2