summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-08 17:53:54 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-08 17:53:54 -0700
commit8695f720cf5e55cd5c78f769c606f9fedde97d76 (patch)
tree2be067e8010671bae71a95c4d9ede4a0b0b1e1d6
parentAdd debug output for backtracking limit. (diff)
downloadportage-8695f720cf5e55cd5c78f769c606f9fedde97d76.tar.gz
portage-8695f720cf5e55cd5c78f769c606f9fedde97d76.tar.bz2
portage-8695f720cf5e55cd5c78f769c606f9fedde97d76.zip
Allow repo in more Atom instances.
-rw-r--r--pym/_emerge/depgraph.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index fcf7bf8e3..5792c9605 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1696,12 +1696,14 @@ class depgraph(object):
if expanded_atoms:
atom = expanded_atoms[0]
else:
- null_atom = Atom(insert_category_into_atom(x, "null"))
+ null_atom = Atom(insert_category_into_atom(x, "null"),
+ allow_repo=True)
cat, atom_pn = portage.catsplit(null_atom.cp)
virts_p = root_config.settings.get_virts_p().get(atom_pn)
if virts_p:
# Allow the depgraph to choose which virtual.
- atom = Atom(null_atom.replace('null/', 'virtual/', 1))
+ atom = Atom(null_atom.replace('null/', 'virtual/', 1),
+ allow_repo=True)
else:
atom = null_atom
@@ -5415,12 +5417,14 @@ class _dep_check_composite_db(dbapi):
if expanded_atoms:
atom = expanded_atoms[0]
else:
- null_atom = Atom(insert_category_into_atom(atom, "null"))
+ null_atom = Atom(insert_category_into_atom(atom, "null"),
+ allow_repo=True)
cat, atom_pn = portage.catsplit(null_atom.cp)
virts_p = root_config.settings.get_virts_p().get(atom_pn)
if virts_p:
# Allow the resolver to choose which virtual.
- atom = Atom(null_atom.replace('null/', 'virtual/', 1))
+ atom = Atom(null_atom.replace('null/', 'virtual/', 1),
+ allow_repo=True)
else:
atom = null_atom
return atom