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 1QNaoj-0005m8-3z for garchives@archives.gentoo.org; Sat, 21 May 2011 01:17:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C207E1C047; Sat, 21 May 2011 01:17:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8DB4B1C047 for ; Sat, 21 May 2011 01:17:12 +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 1FE791B4018 for ; Sat, 21 May 2011 01:17:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 80A8E8001E for ; Sat, 21 May 2011 01:17:11 +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:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e2c6a1f0438701bbcbd49f69bf4549cbfed3c0cd Date: Sat, 21 May 2011 01:17:11 +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: 8317107ee3d2ddb92ba3a0be434eb25b commit: e2c6a1f0438701bbcbd49f69bf4549cbfed3c0cd Author: Zac Medico gentoo org> AuthorDate: Sat May 21 01:16:46 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 01:16:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De2c6a1f0 test_merge_order: remove uneeded ambigous flag --- pym/portage/tests/resolver/test_merge_order.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index f51d14f..a59a678 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -48,7 +48,6 @@ class MergeOrderTestCase(TestCase): ResolverPlaygroundTestCase( ["app-misc/some-app-b"], success =3D True, - ambigous_merge_order =3D True, mergelist =3D ["app-misc/circ-post-runtime-a-1", "app-misc/circ-post= -runtime-b-1", "app-misc/some-app-b-1"]), ) =20