aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-03-12 17:57:34 +0000
committerBryn M. Reeves <bmr@redhat.com>2014-03-12 17:57:34 +0000
commit15f46d44afa055edc169670303c81fb97dcfd0ae (patch)
tree13553fac68643f0590d28f6f6cb17f1b4e7e598a
parentef4e4b60eeaef33fa5e4ee074c6736cd3412397b (diff)
downloadsos-15f46d44afa055edc169670303c81fb97dcfd0ae.tar.gz
Fix broken binary detection in satellite plugin
The satellite plugin attempts to check for the existence of the 'satellite-debug' binary before running it. This was broken by the mass conversion to PATH for running external commands. Remove the check and just attempt to run the command regardless. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/satellite.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
index 474933a2..28c8bcab 100644
--- a/sos/plugins/satellite.py
+++ b/sos/plugins/satellite.py
@@ -76,9 +76,8 @@ class Satellite(Plugin, RedHatPlugin):
if self.satellite:
self.add_copy_specs(["/etc/tnsnames.ora", "/etc/jabberd",
"/etc/tomcat6/", "/var/log/tomcat6/"])
- if os.path.exists("spacewalk-debug"):
- self.add_cmd_output("spacewalk-debug --dir %s"
- % self.get_cmd_output_path(name="spacewalk-debug"))
+ self.add_cmd_output("spacewalk-debug --dir %s"
+ % self.get_cmd_output_path(name="spacewalk-debug"))
if self.proxy:
self.add_copy_specs(["/etc/squid", "/var/log/squid"])