diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-17 02:34:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-17 02:34:54 +0000 |
| commit | 9d16e1eda061f02009263ca7c0150b57042d3881 (patch) | |
| tree | fa15ca823aac07abf854bd0a973cbc9e9eccfd35 /pym | |
| parent | e8625cebd2daa1c299f545ab10f1212eae789f34 (diff) | |
| download | portage-9d16e1eda061f02009263ca7c0150b57042d3881.tar.gz portage-9d16e1eda061f02009263ca7c0150b57042d3881.tar.bz2 portage-9d16e1eda061f02009263ca7c0150b57042d3881.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.
svn path=/main/trunk/; revision=8155
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 2d2e916bd..0636b65e9 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1810,15 +1810,21 @@ class dblink(object): " 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 |