diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-12 21:44:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-12 21:44:11 +0000 |
| commit | e824a5665b7b9d74c0b8b46d9fb0c21250dab7a5 (patch) | |
| tree | e0f75d0e2ace0f52a32e9bf0067fca2d61b38037 /pym | |
| parent | 3f95b9b0e452a95812bf7691d09a2d3c78af1dfe (diff) | |
| download | portage-e824a5665b7b9d74c0b8b46d9fb0c21250dab7a5.tar.gz portage-e824a5665b7b9d74c0b8b46d9fb0c21250dab7a5.tar.bz2 portage-e824a5665b7b9d74c0b8b46d9fb0c21250dab7a5.zip | |
s:this package wants:this package will: (trunk r8089)
svn path=/main/branches/2.1.2/; revision=8090
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index dfd7ed033..def1fe845 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8024,7 +8024,7 @@ class dblink: 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." + \ |