From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Sun, 19 Sep 2010 18:13:41 +0000 (+0200)
Subject: slot collision handler: Fix bug in atom pretty printer for =* atoms
X-Git-Tag: v2.2_rc85~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d868dd62a1c51e9829a8fe4eb2342d4c5226182d;p=portage.git

slot collision handler: Fix bug in atom pretty printer for =* atoms
---

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)