From 7c5f7657ed3e2402942a6b03c69ac61ebf64bf5b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 9 Apr 2008 18:33:19 +0000 Subject: 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 --- bin/emerge | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 4eee60aab..c70b8f81f 100755 --- 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 \ -- cgit v1.2.3-1-g7c22