From 885e7808eddb830e22d5d72df9137e7395ae1880 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 9 Apr 2008 18:31:59 +0000 Subject: When checking atoms without categories against the installed packages, just check for existence of the cat/pn rather that a full match. svn path=/main/trunk/; revision=9779 --- pym/_emerge/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2ae0a2244..5d89a4c09 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2221,8 +2221,9 @@ class depgraph(object): expanded_atoms = self._dep_expand(root_config, x) installed_cp_set = set() for atom in expanded_atoms: - if vardb.match(atom): - installed_cp_set.add(portage.dep_getkey(atom)) + atom_cp = portage.dep_getkey(atom) + if vardb.cp_list(atom_cp): + installed_cp_set.add(atom_cp) if len(expanded_atoms) > 1 and len(installed_cp_set) == 1: installed_cp = iter(installed_cp_set).next() expanded_atoms = [atom for atom in expanded_atoms \ -- cgit v1.2.3-1-g7c22