expand_new_virtuals: fix pkg_use_enabled call
authorZac Medico <zmedico@gentoo.org>
Tue, 8 Feb 2011 18:54:51 +0000 (10:54 -0800)
committerZac Medico <zmedico@gentoo.org>
Tue, 8 Feb 2011 18:54:51 +0000 (10:54 -0800)
AttributeError: 'tuple' object has no attribute 'use'

pym/portage/dep/dep_check.py

index ca656019daa8a6faeca64c1f7a25f0ac82217967..6d2d99d354e6b2104933553644211ca90903727a 100644 (file)
@@ -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