Index: trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms	(revision 621)
+++ trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms	(revision 622)
@@ -7,17 +7,4 @@
 
 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
@@ -36,5 +23,6 @@
     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)