From e824a5665b7b9d74c0b8b46d9fb0c21250dab7a5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 Oct 2007 21:44:11 +0000 Subject: [PATCH] s:this package wants:this package will: (trunk r8089) svn path=/main/branches/2.1.2/; revision=8090 --- pym/portage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." + \ -- 2.26.2