Add an Atom.evaluate_conditionals() method and use where appropriate.

(trunk r15212)

svn path=/main/branches/2.1.7/; revision=15263

diff --git a/bin/portageq b/bin/portageq
index 9fbf3c9bc656026767054858de56c15da400a353..909876cc850ebac14d152e76f20abd1af462c56c 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -49,11 +49,7 @@ from portage.util import writemsg, writemsg_stdout
 def eval_atom_use(atom):
        if atom.use.conditional and 'USE' in os.environ:
                use = os.environ['USE'].split()
-               evaluated_atom = portage.dep.remove_slot(atom)
-               if atom.slot:
-                       evaluated_atom += ":%s" % atom.slot
-               evaluated_atom += str(atom.use.evaluate_conditionals(use))
-               atom = portage.dep.Atom(evaluated_atom)
+               atom = atom.evaluate_conditionals(use)
        return atom
 
 #-----------------------------------------------------------------------------

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d9a82bc83666ce39f8502f772072697dce0a2b09..8ee7fb3a2ef869414e75fe089d670d0211d73444 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7812,11 +7812,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
                if not repoman and \
                        myuse is not None and isinstance(x, portage.dep.Atom) and x.use:
                        if x.use.conditional:
-                               evaluated_atom = portage.dep.remove_slot(x)
-                               if x.slot:
-                                       evaluated_atom += ":%s" % x.slot
-                               evaluated_atom += str(x.use.evaluate_conditionals(myuse))
-                               x = portage.dep.Atom(evaluated_atom)
+                               x = x.evaluate_conditionals(myuse)
 
                mykey = x.cp
                if not mykey.startswith("virtual/"):

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 70d95e4849d4bf049b39a933bd266cf61409d2a5..409bc93de6cbf043eb4a5e4f9d9543c3d09e37bc 100644 (file)
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -612,6 +612,22 @@ class Atom(_atom_base):
 
                return False
 
+       def evaluate_conditionals(self, use):
+               """
+               Create an atom instance with any USE conditionals evaluated.
+               @param use: The set of enabled USE flags
+               @type other: set
+               @rtype: Atom
+               @return: an atom instance with any USE conditionals evaluated
+               """
+               if not self.use.conditional:
+                       return self
+               atom = remove_slot(self)
+               if self.slot:
+                       atom += ":%s" % self.slot
+               atom += str(self.use.evaluate_conditionals(use))
+               return Atom(atom)
+
        def __copy__(self):
                """Immutable, so returns self."""
                return self