From 13de2fed0e7a8e6257f92357965565430d001767 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Tue, 15 Oct 2013 17:00:09 +0100 Subject: 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 --- sos/plugins/networking.py | 11 +++++------ 1 file 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) -- cgit