diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-08-14 18:22:28 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-08-14 18:22:28 +0100 |
| commit | 0af79c70eafaba9ff50af1f55d0858db1cf5d77c (patch) | |
| tree | 88fadb0854df0aa2f30f70d42000125a2891dac3 | |
| parent | dc9d2128699d6c550c626f375f0d6a974426fc85 (diff) | |
| download | sos-0af79c70eafaba9ff50af1f55d0858db1cf5d77c.tar.gz | |
Remove obsolete checks and exception handling from s390 plug-in
The s390 plug-in has some strange checks on the distribution
version before collecting a couple of s390-specific commands. The
entire code block is also wrapped in try/except.
Remove this: all add_cmd_output() succeed without exceptions even
if the command does not exist or cannot be run. The exception
handling also does nothing useful.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/s390.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index 7254649d..ed9546b1 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -58,14 +58,10 @@ class S390(Plugin, RedHatPlugin): self.add_cmd_output("find /sys -type f") self.add_cmd_output("find /proc/s390dbf -type f") self.add_cmd_output("qethconf list_all") + self.add_cmd_output("lsqeth") + self.add_cmd_output("lszfcp") ret, dasd_dev, rtime = self.call_ext_prog("ls /dev/dasd?") for x in dasd_dev.split('\n'): self.add_cmd_output("dasdview -x -i -j -l -f %s" % (x,)) self.add_cmd_output("fdasd -p %s" % (x,)) - try: - rhelver = self.policy().rhel_version() - if rhelver == 5: - self.add_cmd_output("lsqeth") - self.add_cmd_output("lszfcp") - except: - rhelver = None + |