projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffd08be
)
merge_order_assertions: fix string format error
author
Zac Medico
<zmedico@gentoo.org>
Sat, 21 May 2011 10:34:30 +0000
(
03:34
-0700)
committer
Zac Medico
<zmedico@gentoo.org>
Sat, 21 May 2011 10:34:30 +0000
(
03:34
-0700)
pym/portage/tests/resolver/ResolverPlayground.py
patch
|
blob
|
history
diff --git
a/pym/portage/tests/resolver/ResolverPlayground.py
b/pym/portage/tests/resolver/ResolverPlayground.py
index dd3a944e42a3cdd29c56465321fb6a114dd4f8c1..8e7f600b1caede118ff53b53abd70bd5e571e636 100644
(file)
--- 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)