summaryrefslogtreecommitdiffstats
path: root/pym/portage/dep/__init__.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-06-08 15:08:19 -0700
committerZac Medico <zmedico@gentoo.org>2012-06-08 17:27:12 -0700
commit50e4d62e296c2579682d2cf11a29ada83c1323db (patch)
treed8fc2477c741b25016023b45bd476e22f80510c4 /pym/portage/dep/__init__.py
parentdcdfed5f9487f4232affc156518e05e00c10da5f (diff)
downloadportage-50e4d62e296c2579682d2cf11a29ada83c1323db.tar.gz
portage-50e4d62e296c2579682d2cf11a29ada83c1323db.tar.bz2
portage-50e4d62e296c2579682d2cf11a29ada83c1323db.zip
depgraph: pass use_reduce result to dep_check
This allows us to avoid extraneous use_reduce/paren_enclose calls.
Diffstat (limited to 'pym/portage/dep/__init__.py')
-rw-r--r--pym/portage/dep/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 4cd081310..ade3a73a8 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -250,7 +250,7 @@ class paren_normalize(list):
self._zap_parens(x, dest)
return dest
-def paren_enclose(mylist, unevaluated_atom=False):
+def paren_enclose(mylist, unevaluated_atom=False, opconvert=False):
"""
Convert a list to a string with sublists enclosed with parens.
@@ -267,7 +267,10 @@ def paren_enclose(mylist, unevaluated_atom=False):
mystrparts = []
for x in mylist:
if isinstance(x, list):
- mystrparts.append("( "+paren_enclose(x)+" )")
+ if opconvert and x and x[0] == "||":
+ mystrparts.append("%s ( %s )" % (x[0], paren_enclose(x[1:])))
+ else:
+ mystrparts.append("( %s )" % paren_enclose(x))
else:
if unevaluated_atom:
x = getattr(x, 'unevaluated_atom', x)