summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-09 18:31:59 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-09 18:31:59 +0000
commit885e7808eddb830e22d5d72df9137e7395ae1880 (patch)
tree0d9b3d7445625edcc022c470cb8a0c05fba41458
parent225ea98322c5383093126596da1ac53f4fdc53cd (diff)
downloadportage-885e7808eddb830e22d5d72df9137e7395ae1880.tar.gz
portage-885e7808eddb830e22d5d72df9137e7395ae1880.tar.bz2
portage-885e7808eddb830e22d5d72df9137e7395ae1880.zip
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
-rw-r--r--pym/_emerge/__init__.py5
1 files 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 \