From 5dc4bb046b871088923313bce4b66bde3c8e2e80 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 4 Feb 2011 14:31:32 -0800
Subject: check_required_use: clarify operator logic

---
 pym/portage/dep/__init__.py                   | 15 +++++++--------
 pym/portage/tests/dep/testCheckRequiredUse.py |  5 +++++
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'pym')

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b27d58956..b429e5617 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2187,10 +2187,9 @@ def check_required_use(required_use, use, iuse_match):
 			if level > 0:
 				level -= 1
 				l = stack.pop()
-				ignore = False
+				op = None
 				if stack[level]:
 					if stack[level][-1] in ("||", "^^"):
-						ignore = True
 						op = stack[level].pop()
 						satisfied = is_satisfied(op, l)
 						stack[level].append(satisfied)
@@ -2198,13 +2197,12 @@ def check_required_use(required_use, use, iuse_match):
 
 					elif not isinstance(stack[level][-1], bool) and \
 						stack[level][-1][-1] == "?":
-						if is_active(stack[level][-1][:-1]):
-							op = stack[level].pop()
+						op = stack[level].pop()
+						if is_active(op[:-1]):
 							satisfied = is_satisfied(op, l)
 							stack[level].append(satisfied)
 							node._satisfied = satisfied
 						else:
-							stack[level].pop()
 							node._satisfied = True
 							last_node = node._parent._children.pop()
 							if last_node is not node:
@@ -2212,12 +2210,13 @@ def check_required_use(required_use, use, iuse_match):
 									"node is not last child of parent")
 							node = node._parent
 							continue
-						ignore = True
 
-				if l and not ignore:
+				if op is None:
 					satisfied = False not in l
-					stack[level].append(satisfied)
 					node._satisfied = satisfied
+					if l:
+						stack[level].append(satisfied)
+
 					if node._parent._operator not in ("||", "^^"):
 						last_node = node._parent._children.pop()
 						if last_node is not node:
diff --git a/pym/portage/tests/dep/testCheckRequiredUse.py b/pym/portage/tests/dep/testCheckRequiredUse.py
index c5a8f5304..a0e10b1e7 100644
--- a/pym/portage/tests/dep/testCheckRequiredUse.py
+++ b/pym/portage/tests/dep/testCheckRequiredUse.py
@@ -195,6 +195,11 @@ class TestCheckRequiredUse(TestCase):
 				"|| ( ( ( ( a ) ) ( ( ( b c ) ) ) ) )",
 				[""],
 				"a b c"
+			),
+			(
+				"|| ( ( a ( ( ) ( ) ) ( ( ) ) ( b ( ) c ) ) )",
+				[""],
+				"a b c"
 			)
 		)
 		for required_use, use, expected in test_cases:
-- 
cgit v1.2.3-1-g7c22