s:this package wants:this package will: (trunk r8089)
authorZac Medico <zmedico@gentoo.org>
Fri, 12 Oct 2007 21:44:11 +0000 (21:44 -0000)
committerZac 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

index dfd7ed0331cad87999ed4643b66254554d023e63..def1fe845adfdefc50fbc4d639c5c12ebf42d938 100644 (file)
@@ -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." + \