s/!owned/replaced/ in merge output to clarify it
authorMarius Mauch <genone@gentoo.org>
Sat, 23 Jun 2007 16:17:49 +0000 (16:17 -0000)
committerMarius Mauch <genone@gentoo.org>
Sat, 23 Jun 2007 16:17:49 +0000 (16:17 -0000)
svn path=/main/trunk/; revision=6975

pym/portage/dbapi/vartree.py

index 5cf81c425277cd08534bbb16ad004acd07c1e194..ef6becc72ed8fb01702ced4dd415fdf96adf6e54 100644 (file)
@@ -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,