projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f95b9b
)
s:this package wants:this package will: (trunk r8089)
author
Zac Medico
<zmedico@gentoo.org>
Fri, 12 Oct 2007 21:44:11 +0000
(21:44 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Fri, 12 Oct 2007 21:44:11 +0000
(21:44 -0000)
svn path=/main/branches/2.1.2/; revision=8090
pym/portage.py
patch
|
blob
|
history
diff --git
a/pym/portage.py
b/pym/portage.py
index dfd7ed0331cad87999ed4643b66254554d023e63..def1fe845adfdefc50fbc4d639c5c12ebf42d938 100644
(file)
--- a/
pym/portage.py
+++ b/
pym/portage.py
@@
-8024,7
+8024,7
@@
class dblink:
vartree=self.vartree)
if collisions:
- msg = "This package w
ants to
overwrite one or more files that" + \
+ msg = "This package w
ill
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." + \