From c970bda19aaffba226d3b53b8b39b527892631f3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 24 May 2007 03:36:01 +0000 Subject: Fix paren_normalize logic. svn path=/main/trunk/; revision=6610 --- pym/portage/dep.py | 9 +++------ 1 file 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(), [])) -- cgit v1.2.3-1-g7c22