[gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dep/

["Zac Medico" <zmedico@gentoo.org>]

commit:     bddc55460cb4da3d8d329c772018119ba6bcfaaa
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 22:59:28 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 00:31:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bddc5546

REQUIRED_USE: fix single child conditionals disp

---
 pym/portage/dep/__init__.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b429e56..6b125f0 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2226,15 +2226,14 @@ def check_required_use(required_use, use, iuse_match):
 							node._parent._children.append(child)
 							if isinstance(child, _RequiredUseBranch):
 								child._parent = node._parent
-					node = node._parent
-					continue
 
-				if not node._children:
+				elif not node._children:
 					last_node = node._parent._children.pop()
 					if last_node is not node:
 						raise AssertionError(
 							"node is not last child of parent")
-				elif len(node._children) == 1:
+
+				elif len(node._children) == 1 and op in ("||", "^^"):
 					last_node = node._parent._children.pop()
 					if last_node is not node:
 						raise AssertionError(
@@ -2243,6 +2242,7 @@ def check_required_use(required_use, use, iuse_match):
 					if isinstance(node._children[0], _RequiredUseBranch):
 						node._children[0]._parent = node._parent
 						node = node._children[0]
+
 				else:
 					for index, child in enumerate(node._children):
 						if isinstance(child, _RequiredUseBranch) and \