diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-13 06:16:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-13 06:16:57 +0000 |
| commit | 249f2ae314902fe65f9def64ac9b9ab7e060a75f (patch) | |
| tree | d8d36058e40d52042f48a171f7e2b75f8dc01a15 | |
| parent | 0490f1075976345333141cddf2e0d7c3ddeeb055 (diff) | |
| download | portage-249f2ae314902fe65f9def64ac9b9ab7e060a75f.tar.gz portage-249f2ae314902fe65f9def64ac9b9ab7e060a75f.tar.bz2 portage-249f2ae314902fe65f9def64ac9b9ab7e060a75f.zip | |
Make the file collision eerror message less verbose
when in --quiet mode.
svn path=/main/trunk/; revision=8100
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index ded0943af..045a33ebb 100644 --- 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 |