summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-24 03:36:01 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-24 03:36:01 +0000
commitc970bda19aaffba226d3b53b8b39b527892631f3 (patch)
treedc14687ee81eb8a1749c1b190d42427c86ca5184
parent39f7fae846ccc5883870a989a7c9951233a0c22d (diff)
downloadportage-c970bda19aaffba226d3b53b8b39b527892631f3.tar.gz
portage-c970bda19aaffba226d3b53b8b39b527892631f3.tar.bz2
portage-c970bda19aaffba226d3b53b8b39b527892631f3.zip
Fix paren_normalize logic.
svn path=/main/trunk/; revision=6610
-rw-r--r--pym/portage/dep.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index d1e22376e..927cc6ae1 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -127,15 +127,12 @@ class paren_normalize(list):
for x in i:
if isinstance(x, basestring):
if x == '||':
- x = i.next()
+ x = self._zap_parens(i.next(), [], disjunction=True)
if len(x) == 1:
- if isinstance(x[0], basestring):
- dest.append(x[0])
- else:
- self._zap_parens(x, dest, disjunction=disjunction)
+ dest.append(x[0])
else:
dest.append("||")
- dest.append(self._zap_parens(x, [], disjunction=True))
+ dest.append(x)
elif x.endswith("?"):
dest.append(x)
dest.append(self._zap_parens(i.next(), []))