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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2ae0a2244e7a98000d33a6f4fa3b345e5b61f96a..5d89a4c0951871d117a7248581bf91eee56a94f0 100644 (file)
--- 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 \