From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 24 May 2007 03:36:01 +0000 (-0000)
Subject: Fix paren_normalize logic.
X-Git-Tag: v2.2_pre1~1378
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c970bda19aaffba226d3b53b8b39b527892631f3;p=portage.git

Fix paren_normalize logic.

svn path=/main/trunk/; revision=6610
---

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(), []))