projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f456171
)
Fix malformed atom formatting for slot conflict.
author
Zac Medico
<zmedico@gentoo.org>
Sun, 14 Nov 2010 05:23:01 +0000
(21:23 -0800)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 14 Nov 2010 05:23:01 +0000
(21:23 -0800)
This fixes bug #345097.
pym/_emerge/resolver/slot_collision.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/resolver/slot_collision.py
b/pym/_emerge/resolver/slot_collision.py
index 347f569e97f0fa6693dbb6082d1a4d2dfe997072..ba76ed06895bad1ffd0f059f08cb326fae346c2f 100644
(file)
--- a/
pym/_emerge/resolver/slot_collision.py
+++ b/
pym/_emerge/resolver/slot_collision.py
@@
-309,7
+309,7
@@
class slot_conflict_handler(object):
end = start + len(ver)
atom_str = atom_str[:start] + \
colorize("BAD", ver) + \
- atom_str[end
+1
:]
+ atom_str[end:]
if slot:
atom_str = atom_str.replace(":" + slot, colorize("BAD", ":" + slot))