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 1QUgAH-0007Lf-6f for garchives@archives.gentoo.org; Thu, 09 Jun 2011 14:24:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 887031C03D; Thu, 9 Jun 2011 14:24:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5137B1C03D for ; Thu, 9 Jun 2011 14:24:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D43F91B402B for ; Thu, 9 Jun 2011 14:24:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2D47B8003C for ; Thu, 9 Jun 2011 14:24:42 +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: <1faa9bddc2859c73ce8984b43eca816c30bdb5f1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master 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_use_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: 1faa9bddc2859c73ce8984b43eca816c30bdb5f1 Date: Thu, 9 Jun 2011 14:24:42 +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: d9d3ed216c195baf2bfcea99b4e133ff commit: 1faa9bddc2859c73ce8984b43eca816c30bdb5f1 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Thu Jun 9 14:23:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 9 14:23:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1faa9bdd use_reduce: disallow empty parens This will fix bug #370565. --- pym/portage/dep/__init__.py | 3 +++ pym/portage/tests/dep/test_use_reduce.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 8621543..ba37324 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -369,6 +369,9 @@ def use_reduce(depstr, uselist=3D[], masklist=3D[], m= atchall=3DFalse, excludeall=3D[], i if need_simple_token: raise InvalidDependString( _("expected: file name, got: '%s', token %s") % (token, pos+1)) + if len(mysplit) >=3D pos+2 and mysplit[pos+1] =3D=3D ")": + raise InvalidDependString( + _("expected: dependency string, got: ')', token %s") % (pos+1,)) need_bracket =3D False stack.append([]) level +=3D 1 diff --git a/pym/portage/tests/dep/test_use_reduce.py b/pym/portage/tests= /dep/test_use_reduce.py index 7c7286a..b89752f 100644 --- a/pym/portage/tests/dep/test_use_reduce.py +++ b/pym/portage/tests/dep/test_use_reduce.py @@ -217,7 +217,7 @@ class UseReduce(TestCase): uselist =3D ["foo", "bar"], expected_result =3D [ "||", [ "A", "B" ] ]), UseReduceTestCase( - "A || ( ) foo? ( ) B", + "A || ( bar? ( C ) ) foo? ( bar? ( C ) ) B", expected_result =3D ["A", "B"]), UseReduceTestCase( "|| ( A ) || ( B )", @@ -350,7 +350,7 @@ class UseReduce(TestCase): opconvert =3D True, expected_result =3D [['||', 'A', 'B']]), UseReduceTestCase( - "A || ( ) foo? ( ) B", + "A || ( bar? ( C ) ) foo? ( bar? ( C ) ) B", opconvert =3D True, expected_result =3D ["A", "B"]), UseReduceTestCase( @@ -509,7 +509,7 @@ class UseReduce(TestCase): flat =3D True, expected_result =3D [ "||", "||", "A", "||", "B" ]), UseReduceTestCase( - "A || ( ) foo? ( ) B", + "A || ( bar? ( C ) ) foo? ( bar? ( C ) ) B", flat =3D True, expected_result =3D ["A", "||", "B"]), UseReduceTestCase(