aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2016-02-05 17:28:25 +0000
committerBryn M. Reeves <bmr@redhat.com>2016-02-05 17:28:25 +0000
commit56614f20abb22e7e6c891fc83a9f2c9149646586 (patch)
tree4d5f9e699cfd63f125135d78d3b5cf2445fe8ae0
parent8ef27fa80589fcda452fc1c27c1fc6a0fb385b4a (diff)
downloadsos-56614f20abb22e7e6c891fc83a9f2c9149646586.tar.gz
[rpm] make rpm.rpmva work without --verify
When the global verify switch was introduced the behaviour of the historical 'rpm.rpmva' plugin option was made to depend on the global setting: without --verify no verification is carried out even though it is clear this is not what the user intended. Allow verification to take place in the rpm module if the rpm.va option is True, regardless of the setting of the global --verify option. Fixes #735. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/rpm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 845e85d3..538fb78f 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -63,7 +63,7 @@ class Rpm(Plugin, RedHatPlugin):
add_rpm_cmd(query_fmt, None, None, "package-data")
- if self.get_option("verify"):
+ if self.get_option("verify") or self.get_option("rpmva"):
if self.get_option("rpmva"):
self.add_cmd_output("rpm -Va", root_symlink="rpm-Va",
timeout=180)