diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-05-21 03:34:30 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-05-21 03:34:30 -0700 |
commit | 080bc3b13611e126a41fa2c30545c2ec21e94998 (patch) | |
tree | 112264c7cdcea553126663719e56e9a2e9f69e89 | |
parent | ffd08be66d09bf98b25957ac8b99d414f4549d17 (diff) | |
download | portage-080bc3b13611e126a41fa2c30545c2ec21e94998.tar.gz portage-080bc3b13611e126a41fa2c30545c2ec21e94998.tar.bz2 portage-080bc3b13611e126a41fa2c30545c2ec21e94998.zip |
merge_order_assertions: fix string format error
-rw-r--r-- | 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/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) |