diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-12 21:42:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-12 21:42:09 +0000 |
| commit | 0a1df582a0972d9c9aaa7e606965ab397198e5a4 (patch) | |
| tree | 04264b2e1e37310052b7da1c1d8cba9489de7f77 /pym | |
| parent | c9c508278ee0c30ad8ca7778a6daf4df3ba7df8d (diff) | |
| download | portage-0a1df582a0972d9c9aaa7e606965ab397198e5a4.tar.gz portage-0a1df582a0972d9c9aaa7e606965ab397198e5a4.tar.bz2 portage-0a1df582a0972d9c9aaa7e606965ab397198e5a4.zip | |
s:this package wants:this package will:
svn path=/main/trunk/; revision=8089
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 992d8abaa..8cd32eda2 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1786,7 +1786,7 @@ class dblink(object): vartree=self.vartree) if collisions: - msg = "This package wants to overwrite one or more files that" + \ + msg = "This package will overwrite one or more files that" + \ " may belong to other packages (see list below)." + \ " Add \"collision-protect\" to FEATURES in make.conf" + \ " if you would like the merge to abort in cases like this." + \ |