From 3dc05143f2aa8b23395aad1a24ec19c1d0ec5740 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 2 Jun 2014 14:48:00 +0100
Subject: Fix call_ext_prog() use in abrt, s390, veritas, xen and yum

Several plugins still tried to use the old tuple based return
values for self.call_ext_prog(). Convert them to use the
dictionary values instead.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/abrt.py    | 4 ++--
 sos/plugins/s390.py    | 3 ++-
 sos/plugins/veritas.py | 4 ++--
 sos/plugins/xen.py     | 8 ++++----
 sos/plugins/yum.py     | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index 660c0f74..40437b39 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -29,10 +29,10 @@ class Abrt(Plugin, RedHatPlugin):
                                                             'slow', False)]
 
     def do_backtraces(self):
-        ret, output, rtime = self.call_ext_prog('sqlite3 '
+        result = self.call_ext_prog('sqlite3 '
                     + '/var/spool/abrt/abrt-db \'select UUID from abrt_v4\'')
         try:
-            for uuid in output.split():
+            for uuid in result['output'].split():
                 self.add_cmd_output("abrt-cli -ib %s" % uuid,
                     suggest_filename=("backtrace_%s" % uuid))
         except IndexError:
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 965c2463..4789fd17 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -62,7 +62,8 @@ class S390(Plugin, RedHatPlugin):
             "lsqeth",
             "lszfcp"
         ])
-        ret, dasd_dev, rtime = self.call_ext_prog("ls /dev/dasd?")
+        r = self.call_ext_prog("ls /dev/dasd?")
+        dasd_dev = r['output']
         for x in dasd_dev.split('\n'):
             self.add_cmd_outputs([
                 "dasdview -x -i -j -l -f %s" % (x,),
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 38824df8..607ad7ec 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -31,9 +31,9 @@ class Veritas(Plugin, RedHatPlugin):
 
     def setup(self):
         """ interface with vrtsexplorer to capture veritas related data """
-        stat, out, runtime = self.call_ext_prog(self.get_option("script"))
+        r = self.call_ext_prog(self.get_option("script"))
         try:
-            for line in out.readlines():
+            for line in r['output']:
                 line = line.strip()
                 tarfile = self.do_regex_find_all(r"ftp (.*tar.gz)", line)
             if len(tarfile) == 1:
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 7b2f0d9c..c55b3fdc 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -25,13 +25,13 @@ class Xen(Plugin, RedHatPlugin):
 
     def determine_xen_host(self):
         if os.access("/proc/acpi/dsdt", os.R_OK):
-            (status, output, rtime) = self.call_ext_prog("grep -qi xen /proc/acpi/dsdt")
-            if status == 0:
+            result = self.call_ext_prog("grep -qi xen /proc/acpi/dsdt")
+            if result['status'] == 0:
                 return "hvm"
 
         if os.access("/proc/xen/capabilities", os.R_OK):
-            (status, output, rtime) = self.call_ext_prog("grep -q control_d /proc/xen/capabilities")
-            if status == 0:
+            result = self.call_ext_prog("grep -q control_d /proc/xen/capabilities")
+            if result['status'] == 0:
                 return "dom0"
             else:
                 return "domU"
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index fd96387c..f2c81487 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -60,9 +60,9 @@ class Yum(Plugin, RedHatPlugin):
         if self.get_option("yumdebug") and self.is_installed('yum-utils'):
             # RHEL6+ alternative for this whole function:
             # self.add_cmd_output("yum-debug-dump '%s'" % os.path.join(self.commons['dstroot'],"yum-debug-dump"))
-            ret, output, rtime = self.call_ext_prog("yum-debug-dump")
+            r = self.call_ext_prog("yum-debug-dump")
             try:
-                self.add_cmd_output("zcat %s" % (output.split()[-1],))
+                self.add_cmd_output("zcat %s" % (r['output'].split()[-1],))
             except IndexError:
                 pass
 
-- 
cgit