When checking atoms without categories against the installed packages, just

check for existence of the cat/pn rather that a full match. (trunk r9779)

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

diff --git a/bin/emerge b/bin/emerge
index 4eee60aab19b1a18b45e5208c6dc24c31e1d363e..c70b8f81f092595b5b5f22f608b9d2a10f8ac9da 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2360,8 +2360,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 \