Make the file collision eerror message less verbose

when in --quiet mode. (trunk r8100)

svn path=/main/branches/2.1.2/; revision=8101

diff --git a/pym/portage.py b/pym/portage.py
index 747ae956023f622da03bcd03277b53ac61f88eac..29a3075ba0f9fd386b27f68d255fec7f80e44628 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8035,15 +8035,17 @@ class dblink:
                        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