not worth defining an exception class for one invocation site

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-remote-listvms

diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms
index 1bb22fb..81722e9 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -6,19 +6,6 @@ suite.
 """
 
 from subprocess import PIPE, Popen
 """
 
 from subprocess import PIPE, Popen

-try:
-    from subprocess import CalledProcessError
-except ImportError:
-    # Python 2.4 doesn't implement CalledProcessError
-    class CalledProcessError(Exception):
-        """This exception is raised when a process run by check_call() returns
-        a non-zero exit status. The exit status will be stored in the
-        returncode attribute."""
-        def __init__(self, returncode, cmd):
-            self.returncode = returncode
-            self.cmd = cmd
-        def __str__(self):
-            return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)

 import sys
 import yaml
 
 import sys
 import yaml
 

@@ -35,7 +22,8 @@ def main(argv):
     outputs = [p.communicate()[0] for p in pipes]
     for p in pipes:
         if p.returncode != 0:
     outputs = [p.communicate()[0] for p in pipes]
     for p in pipes:
         if p.returncode != 0:

-            raise CalledProcessError(p.returncode, 'remctl')
+            raise RuntimeError("Command '%s' returned non-zero exit status %d"
+                               % ('remctl', p.returncode)) 

     results = [yaml.load(o, yaml.CSafeLoader) for o in outputs]
     results = filter(lambda x: x is not None, results)
 
     results = [yaml.load(o, yaml.CSafeLoader) for o in outputs]
     results = filter(lambda x: x is not None, results)