diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-13 06:21:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-13 06:21:38 +0000 |
| commit | 886b99838b17d10c7f08f24227b624132db9abba (patch) | |
| tree | 19f4d1f8e2d97c9d9ba176e817df4f1be250290f /pym | |
| parent | 836560e718315bd76865042ae5b88a6ee11c4765 (diff) | |
| download | portage-886b99838b17d10c7f08f24227b624132db9abba.tar.gz portage-886b99838b17d10c7f08f24227b624132db9abba.tar.bz2 portage-886b99838b17d10c7f08f24227b624132db9abba.zip | |
Make the file collision eerror message less verbose
when in --quiet mode. (trunk r8100)
svn path=/main/branches/2.1.2/; revision=8101
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index 747ae9560..29a3075ba 100644 --- 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 |