diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-17 03:01:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-17 03:01:41 +0000 |
| commit | 85f82e0932e14d64b4a2ed72742cfa959d4663bc (patch) | |
| tree | b241e1d3e359709a6f88c05f535d2e45ee53aca9 /pym | |
| parent | e3152c3c017a0ed2fe4288746c9f47dfde4aa255 (diff) | |
| download | portage-85f82e0932e14d64b4a2ed72742cfa959d4663bc.tar.gz portage-85f82e0932e14d64b4a2ed72742cfa959d4663bc.tar.bz2 portage-85f82e0932e14d64b4a2ed72742cfa959d4663bc.zip | |
Bug #196043 - Update the file collision ewarn notice
to try and clarify the cases when a bug should NOT
be filed. Also, recommend the new `portageq owners /
<filename>` command since it works properly even
when paths are ambiguous due to symlinked
directories. (trunk r8155)
svn path=/main/branches/2.1.2/; revision=8160
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index 5363c372d..92e2a9a76 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8071,15 +8071,21 @@ class dblink: " Add \"collision-protect\" to FEATURES in make.conf" + \ " 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)." + msg += " You can use a command such as" + \ + " \\`portageq owners / <filename>\\` to identify the" + \ + " installed package that owns a file. If portageq" + \ + " reports that only one package owns a file then do NOT" + \ + " file a bug report. A bug report is only useful if it" + \ + " identifies at least two or more packages that are known" + \ + " install the same file(s). If a collision occurs and you" + \ + " can not explain where the file came from then you" + \ + " should simply ignore the collision since there is not" + \ + " enough information to determine if a real problem" + \ + " exists. Please do NOT file a bug report at" + \ + " http://bugs.gentoo.org unless you report exactly which" + \ + " two packages install the same file(s). Once again," + \ + " please do NOT file a bug report unless you have" + \ + " completely understood the above message." self.settings["EBUILD_PHASE"] = "preinst" cmd = "source '%s/isolated-functions.sh' ; " % PORTAGE_BIN_PATH |