|
 |
6b17e9 |
commit 923a68777927eaaee3c5fa289053ac3a87d353f9
|
|
|
6b17e9 |
Author: Bryn M. Reeves <bmr@redhat.com>
|
|
|
6b17e9 |
Date: Tue Oct 15 17:00:09 2013 +0100
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Remove useless os.path.exists check for brctl executable
|
|
|
6b17e9 |
|
|
|
6b17e9 |
The networking module previously checked that its hard-coded path
|
|
|
6b17e9 |
for the brctl command existed before collecting output. This was
|
|
|
6b17e9 |
missed in the conversion to using policy defined PATH search for
|
|
|
6b17e9 |
external commands in commit e0d132e.
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Similar problems were fixed in commits 8b10cb0, 374da99, 8883155.
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
6b17e9 |
|
|
|
6b17e9 |
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
|
|
|
6b17e9 |
index 90e1b58..9724a4f 100644
|
|
|
6b17e9 |
--- a/sos/plugins/networking.py
|
|
|
6b17e9 |
+++ b/sos/plugins/networking.py
|
|
|
6b17e9 |
@@ -111,12 +111,11 @@ class Networking(Plugin):
|
|
|
6b17e9 |
self.add_cmd_output("ethtool -c "+eth)
|
|
|
6b17e9 |
self.add_cmd_output("ethtool -g "+eth)
|
|
|
6b17e9 |
|
|
|
6b17e9 |
- if os.path.exists("brctl"):
|
|
|
6b17e9 |
- brctl_file=self.add_cmd_output("brctl show")
|
|
|
6b17e9 |
- brctl_out=self.call_ext_prog("brctl show")
|
|
|
6b17e9 |
- if brctl_out:
|
|
|
6b17e9 |
- for br_name in self.get_bridge_name(brctl_out):
|
|
|
6b17e9 |
- self.add_cmd_output("brctl showstp "+br_name)
|
|
|
6b17e9 |
+ brctl_file=self.add_cmd_output("brctl show")
|
|
|
6b17e9 |
+ brctl_out=self.call_ext_prog("brctl show")
|
|
|
6b17e9 |
+ if brctl_out:
|
|
|
6b17e9 |
+ for br_name in self.get_bridge_name(brctl_out):
|
|
|
6b17e9 |
+ self.add_cmd_output("brctl showstp "+br_name)
|
|
|
6b17e9 |
|
|
|
6b17e9 |
if self.get_option("traceroute"):
|
|
|
6b17e9 |
self.add_cmd_output("/bin/traceroute -n %s" % self.trace_host)
|