diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-12 17:52:11 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-12 17:52:11 -0800 |
| commit | c42004eb552c9117d221b0e2063e8696efca35dc (patch) | |
| tree | 7d50302742b93221f7934e74eb2c86ffd656eff0 /pym/portage/dep/dep_check.py | |
| parent | cbc252bbfe3f2650995e429005122c0539c691cf (diff) | |
| download | portage-c42004eb552c9117d221b0e2063e8696efca35dc.tar.gz portage-c42004eb552c9117d221b0e2063e8696efca35dc.tar.bz2 portage-c42004eb552c9117d221b0e2063e8696efca35dc.zip | |
depgraph: return virtual edges from select_atoms
Diffstat (limited to 'pym/portage/dep/dep_check.py')
| -rw-r--r-- | pym/portage/dep/dep_check.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index ed85be618..200f01699 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -36,7 +36,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", if parent is not None: if virt_parent is not None: graph_parent = virt_parent - parent = virt_parent[0] + parent = virt_parent else: graph_parent = parent eapi = parent.metadata["EAPI"] @@ -154,7 +154,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", % (depstring,), noiselevel=-1, level=logging.DEBUG) # Set EAPI used for validation in dep_check() recursion. - mytrees["virt_parent"] = (pkg, virt_atom) + mytrees["virt_parent"] = pkg try: mycheck = dep_check(depstring, mydbapi, mysettings, @@ -175,6 +175,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", a.append(mycheck[1]) if atom_graph is not None: atom_graph.add(virt_atom, graph_parent) + atom_graph.add(pkg, virt_atom) # Plain old-style virtuals. New-style virtuals are preferred. if not pkgs: for y in mychoices: @@ -560,7 +561,7 @@ def dep_check(depstring, mydbapi, mysettings, use="yes", mode=None, myuse=None, eapi = None if parent is not None: if virt_parent is not None: - current_parent = virt_parent[0] + current_parent = virt_parent else: current_parent = parent |