diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-07 00:15:56 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-07 00:15:56 -0700 |
| commit | 59a8986cd9393d44fe53ac66bf6e0d3e763b6f37 (patch) | |
| tree | 35fb7c5999b52c81d4c767d7fd3d529629f96399 | |
| parent | 374b0c8374915e0999ed342c0a474d0cf2548a62 (diff) | |
| download | portage-59a8986cd9393d44fe53ac66bf6e0d3e763b6f37.tar.gz portage-59a8986cd9393d44fe53ac66bf6e0d3e763b6f37.tar.bz2 portage-59a8986cd9393d44fe53ac66bf6e0d3e763b6f37.zip | |
Allow repo atoms more often in InternalPackageSet
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index efcb201ae..a54c6338e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -549,7 +549,7 @@ class depgraph(object): # PROVIDE when necessary, while match_from_list does not. parent, atom = parent_atom atom_set = InternalPackageSet( - initial_atoms=(atom,)) + initial_atoms=(atom,), allow_repo=True) if atom_set.findAtomForPackage(pkg, modified_use=self._pkg_use_enabled(pkg)): parent_atoms.add(parent_atom) else: @@ -821,7 +821,8 @@ class depgraph(object): dep.atom is not None: # Use package set for matching since it will match via # PROVIDE when necessary, while match_from_list does not. - atom_set = InternalPackageSet(initial_atoms=[dep.atom]) + atom_set = InternalPackageSet(initial_atoms=[dep.atom], + allow_repo=True) if not atom_set.findAtomForPackage(existing_node, \ modified_use=self._pkg_use_enabled(existing_node)): existing_node_matches = False @@ -1371,7 +1372,8 @@ class depgraph(object): for atom in pkg_atom_map[pkg1]: cp_atoms.add(atom) atom_pkg_graph.add(pkg1, atom) - atom_set = InternalPackageSet(initial_atoms=(atom,)) + atom_set = InternalPackageSet(initial_atoms=(atom,), + allow_repo=True) for pkg2 in pkgs: if pkg2 is pkg1: continue |