aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-10-15 17:00:09 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-10-15 17:00:09 +0100
commit13de2fed0e7a8e6257f92357965565430d001767 (patch)
tree528bc85638923bbc27e1fc7f6f9a3e36c8ca7d51
parentfc82baea4451a9cb3a1a64f792069a9306208b4e (diff)
downloadsos-13de2fed0e7a8e6257f92357965565430d001767.tar.gz
Remove useless os.path.exists check for brctl executable
The networking module previously checked that its hard-coded path for the brctl command existed before collecting output. This was missed in the conversion to using policy defined PATH search for external commands in commit e0d132e. Similar problems were fixed in commits 8b10cb0, 374da99, 8883155. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/networking.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index 90e1b58b..9724a4f6 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -111,12 +111,11 @@ class Networking(Plugin):
self.add_cmd_output("ethtool -c "+eth)
self.add_cmd_output("ethtool -g "+eth)
- if os.path.exists("brctl"):
- brctl_file=self.add_cmd_output("brctl show")
- brctl_out=self.call_ext_prog("brctl show")
- if brctl_out:
- for br_name in self.get_bridge_name(brctl_out):
- self.add_cmd_output("brctl showstp "+br_name)
+ brctl_file=self.add_cmd_output("brctl show")
+ brctl_out=self.call_ext_prog("brctl show")
+ if brctl_out:
+ for br_name in self.get_bridge_name(brctl_out):
+ self.add_cmd_output("brctl showstp "+br_name)
if self.get_option("traceroute"):
self.add_cmd_output("/bin/traceroute -n %s" % self.trace_host)