diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-06-23 16:17:49 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-06-23 16:17:49 +0000 |
| commit | e7b4a43587adc4da8761adf88b05e1238303331a (patch) | |
| tree | 8b65ac54ebefa9347adf746a35ffda8f7bf3ade9 /pym | |
| parent | 86de4ff1b2bbc145fa87f9cadd9c7ccb8c35f83e (diff) | |
| download | portage-e7b4a43587adc4da8761adf88b05e1238303331a.tar.gz portage-e7b4a43587adc4da8761adf88b05e1238303331a.tar.bz2 portage-e7b4a43587adc4da8761adf88b05e1238303331a.zip | |
s/!owned/replaced/ in merge output to clarify it
svn path=/main/trunk/; revision=6975
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |