From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PlWnw-0007O1-O1 for garchives@archives.gentoo.org; Sat, 05 Feb 2011 01:19:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EC54E071C; Sat, 5 Feb 2011 01:19:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B3B1E073B for ; Sat, 5 Feb 2011 01:19:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3C8B1B40E5 for ; Sat, 5 Feb 2011 01:19:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C85068006E for ; Sat, 5 Feb 2011 00:59:37 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: bddc55460cb4da3d8d329c772018119ba6bcfaaa Date: Sat, 5 Feb 2011 00:59:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a3dd0c811c7fd0480cbc6c101c5876e0 commit: bddc55460cb4da3d8d329c772018119ba6bcfaaa Author: Zac Medico gentoo org> AuthorDate: Fri Feb 4 22:59:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 5 00:31:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbddc5546 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_ma= tch): node._parent._children.append(child) if isinstance(child, _RequiredUseBranch): child._parent =3D node._parent - node =3D node._parent - continue =20 - if not node._children: + elif not node._children: last_node =3D node._parent._children.pop() if last_node is not node: raise AssertionError( "node is not last child of parent") - elif len(node._children) =3D=3D 1: + + elif len(node._children) =3D=3D 1 and op in ("||", "^^"): last_node =3D node._parent._children.pop() if last_node is not node: raise AssertionError( @@ -2243,6 +2242,7 @@ def check_required_use(required_use, use, iuse_matc= h): if isinstance(node._children[0], _RequiredUseBranch): node._children[0]._parent =3D node._parent node =3D node._children[0] + else: for index, child in enumerate(node._children): if isinstance(child, _RequiredUseBranch) and \