REQUIRED_USE: fix single child conditionals disp

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index b429e5617b7b45a0e6dbd10ae3b81557161ee498..6b125f04c51761538e339793db845611a8912c2c 100644 (file)
--- 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 \