s:this package wants:this package will:

svn path=/main/trunk/; revision=8089

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 992d8abaa1ca4a1a0cda2104d0009ac37c701da5..8cd32eda2f7bb03f4c2f9c01c2f80ae70de04167 100644 (file)
--- 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." + \