[Yum-devel] [PATCH] Don't encourage users to file a bug in case rpmdb is inconsistent

[Jan Zeleny]

---
 cli.py          | 7 ++++++-
 yum/__init__.py | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cli.py b/cli.py
index 63a9236..12817fc 100755
--- a/cli.py
+++ b/cli.py
@@ -615,6 +615,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         self.verbose_logger.log(yum.logginglevels.INFO_2, 
              _('Running transaction check'))
         msgs = self._run_rpm_check()
+        depsolve = True
         if msgs:
             rpmlib_only = True
             for msg in msgs:
@@ -625,13 +626,17 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
                 print _("ERROR You need to update rpm to handle:")
             else:
                 print _('ERROR with transaction check vs depsolve:')
+                depsolve = False
 
             for msg in msgs:
                 print to_utf8(msg)
 
             if rpmlib_only:
                 return 1, [_('RPM needs to be updated')]
-            return 1, [_('Please report this error in %s') % self.conf.bugtracker_url]
+            if depsolve:
+                return 1, []
+            else:
+                return 1, [_('Please report this error in %s') % self.conf.bugtracker_url]
 
         self.verbose_logger.debug('Transaction check time: %0.3f' % (time.time() - rcd_st))
 
diff --git a/yum/__init__.py b/yum/__init__.py
index fd54208..6641454 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -6286,8 +6286,12 @@ much more problems).
                 raise Errors.YumRPMCheckError, retmsgs
             retmsgs = [_('ERROR with transaction check vs depsolve:')]
             retmsgs.extend(msgs) 
-            retmsgs.append(_('Please report this error at %s') 
-                                         % self.conf.bugtracker_url)
+            retmsgs.append(_('This usually indicates pre-existing dependency'\
+                             'issues in rpmdb. Please run rpm -Va --nofiles to '\
+                             'see possible issues.'))
+            retmsgs.append(_('If there are no issues reported, please '\
+                             'report this error at %s')
+                             % self.conf.bugtracker_url)
             raise Errors.YumRPMCheckError,retmsgs
         
         tsConf = {}
-- 
1.7.11.7