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 1QNjWP-0008MH-Ui for garchives@archives.gentoo.org; Sat, 21 May 2011 10:35:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 724391C013; Sat, 21 May 2011 10:34:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3C4351C013 for ; Sat, 21 May 2011 10:34:54 +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 8ADB41B4019 for ; Sat, 21 May 2011 10:34:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EE0E18001F for ; Sat, 21 May 2011 10:34:52 +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: <080bc3b13611e126a41fa2c30545c2ec21e94998.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: 080bc3b13611e126a41fa2c30545c2ec21e94998 Date: Sat, 21 May 2011 10:34:52 +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: 3667dc97ad630ea2d638f59625dc7c08 commit: 080bc3b13611e126a41fa2c30545c2ec21e94998 Author: Zac Medico gentoo org> AuthorDate: Sat May 21 10:34:30 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 10:34:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D080bc3b1 merge_order_assertions: fix string format error --- pym/portage/tests/resolver/ResolverPlayground.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index dd3a944..8e7f600 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -585,7 +585,8 @@ class ResolverPlaygroundTestCase(object): fail_msgs.append("atoms: (" + \ ", ".join(result.atoms) + "), key: " + \ ("merge_order_assertions, expected: %s" % \ - (node1, node2)) + ", got: " + str(got)) + str((node1, node2))) + \ + ", got: " + str(got)) =20 elif key in ("unstable_keywords", "needed_p_mask_changes") and expect= ed is not None: expected =3D set(expected)