Make the file collision eerror message less verbose

when in --quiet mode.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ded0943af9db2f6226fa357a6324e39b7e23630f..045a33ebb659ef3ab00f8947fc62f3ad2a2c66e1 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1781,15 +1781,17 @@ class dblink(object):
                        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." + \
-                       " If you have determined that one or more of the files" + \
-                       " actually belong to another installed package then" + \
-                       " go to http://bugs.gentoo.org and report it as a bug." + \
-                       " Be sure to identify both this package and the other" + \
-                       " installed package in the bug report. Use a command such as " + \
-                       " \\`equery belongs <filename>\\` to identify the installed" + \
-                       " package that owns a file. Do NOT file a bug without" + \
-                       " reporting exactly which two packages install the same file(s)."
+                       " if you would like the merge to abort in cases like this."
+                       if self.settings.get("PORTAGE_QUIET") != "1":
+                               msg += " If you have determined that one or more of the" + \
+                               " files actually belong to another installed package then" + \
+                               " go to http://bugs.gentoo.org and report it as a bug." + \
+                               " Be sure to identify both this package and the other" + \
+                               " installed package in the bug report. Use a command such" + \
+                               " as \\`equery belongs <filename>\\` to identify the" + \
+                               " installed package that owns a file. Do NOT file a bug" + \
+                               " without reporting exactly which two packages install" + \
+                               " the same file(s)."
 
                        self.settings["EBUILD_PHASE"] = "preinst"
                        cmd = "source '%s/isolated-functions.sh' ; " % PORTAGE_BIN_PATH