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 1Pmbqk-0001Ad-2Q for garchives@archives.gentoo.org; Tue, 08 Feb 2011 00:54:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00A40E0B31; Tue, 8 Feb 2011 00:54:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BC3DFE0B30 for ; Tue, 8 Feb 2011 00:54:21 +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 528AE1B4083 for ; Tue, 8 Feb 2011 00:54:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A96D080074 for ; Tue, 8 Feb 2011 00:54:20 +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/, pym/portage/tests/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py pym/portage/tests/dep/test_paren_reduce.py X-VCS-Directories: pym/portage/dep/ pym/portage/tests/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ca57018f8dd8d65f2df5c5df636c2cd7db8445d9 Date: Tue, 8 Feb 2011 00:54:20 +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: f024974bbe5efbc34b27ea39f12a6333 commit: ca57018f8dd8d65f2df5c5df636c2cd7db8445d9 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 7 21:59:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 00:53:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dca57018f paren_reduce: allow parens in atoms, for EAPI 4 This will fix bug #354003. --- pym/portage/dep/__init__.py | 2 +- pym/portage/tests/dep/test_paren_reduce.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index cf83e0a..a8d05f1 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -178,7 +178,7 @@ def paren_reduce(mystr): need_bracket =3D True stack[level].append(token) else: - if need_bracket or "(" in token or ")" in token or "|" in token: + if need_bracket: raise InvalidDependString( _("malformed syntax: '%s'") % mystr) =20 diff --git a/pym/portage/tests/dep/test_paren_reduce.py b/pym/portage/tes= ts/dep/test_paren_reduce.py index 6aac955..a7bbf97 100644 --- a/pym/portage/tests/dep/test_paren_reduce.py +++ b/pym/portage/tests/dep/test_paren_reduce.py @@ -30,6 +30,8 @@ class TestParenReduce(TestCase): =20 ( "|| ( ( A B ) C )", [ "||", [ ["A", "B"], "C"] ]), ( "|| ( ( A B ) ( C ) )", [ "||", [ ["A", "B"], "C"] ]), + # test USE dep defaults for bug #354003 + ( ">=3Ddev-lang/php-5.2[pcre(+)]", [ ">=3Ddev-lang/php-5.2[pcre(+)]" = ]), ) =09 test_cases_xfail =3D (