[PATCH] yum check: no obsoletes/provides check by default. BZ 1014993

Zdenek Pavlas zpavlas at redhat.com
Thu Oct 3 12:43:54 UTC 2013


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

diff --git a/yum/__init__.py b/yum/__init__.py
index d4673fa..b3e7c61 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1639,7 +1639,7 @@ much more problems).
                            ignore_pkgs=[]):
         if out is None:
             out = self.logger.warning
-        if chkcmd is None:
+        if not chkcmd:
             chkcmd = ['dependencies', 'duplicates']
         if header is None:
             # FIXME: _N()
diff --git a/yumcommands.py b/yumcommands.py
index 1530161..6f3462f 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -3127,18 +3127,14 @@ class CheckRpmdbCommand(YumCommand):
             1 = we've errored, exit with error string
             2 = we've got work yet to do, onto the next stage
         """
-        chkcmd = 'all'
-        if extcmds:
-            chkcmd = extcmds
-
         def _out(x):
             print to_unicode(x.__str__())
 
         rc = 0
-        if base._rpmdb_warn_checks(out=_out, warn=False, chkcmd=chkcmd,
+        if base._rpmdb_warn_checks(out=_out, warn=False, chkcmd=extcmds,
                                    header=lambda x: None):
             rc = 1
-        return rc, ['%s %s' % (basecmd, chkcmd)]
+        return rc, ['%s %s' % (basecmd, extcmds)]
 
     def needTs(self, base, basecmd, extcmds):
         """Return whether a transaction set must be set up before this
-- 
1.7.11.7



More information about the Yum-devel mailing list