summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-09-19 20:13:41 +0200
committerZac Medico <zmedico@gentoo.org>2010-09-19 14:23:15 -0700
commitd868dd62a1c51e9829a8fe4eb2342d4c5226182d (patch)
tree201e076d42a7661074ddb496389e08b07e9faa73
parent583cfd11138feb8141253486ac45fc27b6d1d2b3 (diff)
downloadportage-d868dd62a1c51e9829a8fe4eb2342d4c5226182d.tar.gz
portage-d868dd62a1c51e9829a8fe4eb2342d4c5226182d.tar.bz2
portage-d868dd62a1c51e9829a8fe4eb2342d4c5226182d.zip
slot collision handler: Fix bug in atom pretty printer for =* atoms
-rw-r--r--pym/_emerge/resolver/slot_collision.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index e68543bf5..72075259f 100644
--- 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)