From 0a1df582a0972d9c9aaa7e606965ab397198e5a4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 Oct 2007 21:42:09 +0000 Subject: [PATCH] s:this package wants:this package will: svn path=/main/trunk/; revision=8089 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 992d8abaa..8cd32eda2 100644 --- 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." + \ -- 2.26.2