[yum-commits] Branch 'yum-3_2_X' - cli.py docs/yum.conf.5 yum/config.py yum/__init__.py

[skvidal at osuosl.org]

 cli.py          |    2 +-
 docs/yum.conf.5 |    4 ++++
 yum/__init__.py |    3 ++-
 yum/config.py   |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit faa79adb21ffa695a35e2a170fc93f03615af06f
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Nov 13 14:09:14 2008 -0500

    add bugtracker_url as a config option - for when we tell someone to file a bug
    rh bug #471164

diff --git a/cli.py b/cli.py
index 91088d4..9a93d15 100644
--- a/cli.py
+++ b/cli.py
@@ -408,7 +408,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
                 for msg in msgs:
                     print to_utf8(msg)
     
-                return 1, [_('Please report this error in bugzilla')]
+                return 1, [_('Please report this error in %s') % self.conf.bugtracker_url]
 
             self.verbose_logger.debug('rpm_check_debug time: %0.3f' % (time.time() - rcd_st))
 
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 40148a6..8171455 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -305,6 +305,10 @@ Can be set to 'all' or 'best'. All means install all possible arches for any pac
 want to install. Therefore yum install foo will install foo.i386 and foo.x86_64 on x86_64, 
 if it is available. Best means install the best arch for this platform, only.
 
+.IP \fBbugtracker_url \fR
+Url where bugs should be filed for yum. Configurable for local versions or distro-specific
+bugtrackers.
+
 .SH "[repository] OPTIONS"
 .LP 
 The repository section(s) take the following form:
diff --git a/yum/__init__.py b/yum/__init__.py
index 5121da5..a207959 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3289,7 +3289,8 @@ class YumBase(depsolve.Depsolve):
             if msgs:
                 retmsgs = [_('ERROR with rpm_check_debug vs depsolve:')]
                 retmsgs.extend(msgs) 
-                retmsgs.append(_('Please report this error in bugzilla'))
+                retmsgs.append(_('Please report this error at %s') 
+                                             % self.conf.bugtracker_url)
                 raise Errors.YumRPMCheckError,retmsgs
         
         tsConf = {}
diff --git a/yum/config.py b/yum/config.py
index 03123a9..cb7e726 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -667,7 +667,7 @@ class YumConf(StartupConf):
                  # all == install any/all arches you can
                  # best == use the 'best  arch' for the system
                  
-
+    bugtracker_url = Option('http://yum.baseurl.org/report')
     
     _reposlist = []