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 1QO4bZ-0004f8-3U for garchives@archives.gentoo.org; Sun, 22 May 2011 09:05:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9851D1C00A; Sun, 22 May 2011 09:05:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5CCBF1C00A for ; Sun, 22 May 2011 09:05:37 +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 BDAA81B401A for ; Sun, 22 May 2011 09:05:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1350B80506 for ; Sun, 22 May 2011 09:05:36 +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: <85e39abd03c2d3d272d2cc5bfdb08d50aa10e445.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 85e39abd03c2d3d272d2cc5bfdb08d50aa10e445 Date: Sun, 22 May 2011 09:05:36 +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: b37a59854e029994819bfc882410b6ee commit: 85e39abd03c2d3d272d2cc5bfdb08d50aa10e445 Author: Zac Medico gentoo org> AuthorDate: Sun May 22 09:05:15 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 22 09:05:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D85e39abd ambiguous_merge_order: set match =3D False more --- pym/portage/tests/resolver/ResolverPlayground.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index 48ce6e7..39576f1 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -548,12 +548,14 @@ class ResolverPlaygroundTestCase(object): if got_token =3D=3D expected_obj: continue # result doesn't match, so stop early + match =3D False break expected_obj =3D set(expected_obj) try: expected_obj.remove(got_token) except KeyError: # result doesn't match, so stop early + match =3D False break new_expected.append(got_token) while got_stack and expected_obj: