projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
583cfd1
)
slot collision handler: Fix bug in atom pretty printer for =* atoms
author
Sebastian Luther
<SebastianLuther@gmx.de>
Sun, 19 Sep 2010 18:13:41 +0000
(20:13 +0200)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 19 Sep 2010 21:23:15 +0000
(14:23 -0700)
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 e68543bf5f2faa422de1fee16bb14d1f62e03a75..72075259f8d4260168b121725fa12a63b7a931f6 100644
(file)
--- a/
pym/_emerge/resolver/slot_collision.py
+++ b/
pym/_emerge/resolver/slot_collision.py
@@
-1,3
+1,6
@@
+# Copyright 2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
from __future__ import print_function
from _emerge.AtomArg import AtomArg
@@
-281,6
+284,11
@@
class slot_conflict_handler(object):
op = atom.operator
ver = cpv_getversion(atom.cpv)
slot = atom.slot
+
+ if op == "=*":
+ op = "="
+ ver += "*"
+
atom_str = atom_str.replace(op, colorize("BAD", op), 1)
start = atom_str.rfind(ver)