From: Marius Mauch <genone@gentoo.org>
Date: Sat, 23 Jun 2007 16:17:49 +0000 (-0000)
Subject: s/!owned/replaced/ in merge output to clarify it
X-Git-Tag: v2.2_pre1~1178
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7b4a43587adc4da8761adf88b05e1238303331a;p=portage.git

s/!owned/replaced/ in merge output to clarify it

svn path=/main/trunk/; revision=6975
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5cf81c425..ef6becc72 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1188,7 +1188,7 @@ class dblink(object):
 					if is_owned:
 						# A new instance of this package claims the file, so
 						# don't unmerge it.
-						writemsg_stdout("--- !owned %s %s\n" % \
+						writemsg_stdout("--- replaced %s %s\n" % \
 							(file_type, obj))
 						continue
 				# next line includes a tweak to protect modules from being unmerged,