From e7b4a43587adc4da8761adf88b05e1238303331a Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sat, 23 Jun 2007 16:17:49 +0000 Subject: s/!owned/replaced/ in merge output to clarify it svn path=/main/trunk/; revision=6975 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.3-1-g7c22