diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-08 10:54:51 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-08 10:54:51 -0800 |
| commit | 9e7ca47a113714551103cb8e5e8fe4dd51c7deec (patch) | |
| tree | 9c373bb5db1e667efd44b14a127c231cc8cf78d5 | |
| parent | repoman.herdbase: tolerate expat ImportError (diff) | |
| download | portage-9e7ca47a113714551103cb8e5e8fe4dd51c7deec.tar.gz portage-9e7ca47a113714551103cb8e5e8fe4dd51c7deec.tar.bz2 portage-9e7ca47a113714551103cb8e5e8fe4dd51c7deec.zip | |
expand_new_virtuals: fix pkg_use_enabled call
AttributeError: 'tuple' object has no attribute 'use'
| -rw-r--r-- | pym/portage/dep/dep_check.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index ca656019d..6d2d99d35 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -36,10 +36,10 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", if parent is not None: if virt_parent is not None: graph_parent = virt_parent - eapi = virt_parent[0].metadata['EAPI'] + parent = virt_parent[0] else: graph_parent = parent - eapi = parent.metadata["EAPI"] + eapi = parent.metadata["EAPI"] repoman = not mysettings.local_config if kwargs["use_binaries"]: portdb = trees[myroot]["bintree"].dbapi @@ -124,7 +124,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", if x.unevaluated_atom.use: virt_atom += str(x.unevaluated_atom.use) virt_atom = Atom(virt_atom) - if graph_parent is None: + if parent is None: if myuse is None: virt_atom = virt_atom.evaluate_conditionals( mysettings.get("PORTAGE_USE", "").split()) @@ -132,7 +132,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", virt_atom = virt_atom.evaluate_conditionals(myuse) else: virt_atom = virt_atom.evaluate_conditionals( - pkg_use_enabled(graph_parent)) + pkg_use_enabled(parent)) else: virt_atom = Atom(virt_atom) # According to GLEP 37, RDEPEND is the only dependency |