From 080bc3b13611e126a41fa2c30545c2ec21e94998 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 May 2011 03:34:30 -0700 Subject: merge_order_assertions: fix string format error --- pym/portage/tests/resolver/ResolverPlayground.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index dd3a944e4..8e7f600b1 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)) elif key in ("unstable_keywords", "needed_p_mask_changes") and expected is not None: expected = set(expected) -- cgit v1.2.3-1-g7c22