Use default version of python (currently 2.4), not 2.5.

[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 eaefffd..e3dfb94 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/python

 
 """
 Collates the results of listvms from multiple VM servers.  Part of the xvm
 
 """
 Collates the results of listvms from multiple VM servers.  Part of the xvm

@@ -6,7 +6,20 @@ suite.
 """
 
 from itertools import chain
 """
 
 from itertools import chain

-from subprocess import CalledProcessError, 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)

 from sys import argv, stdout
 from yaml import safe_dump, safe_load
 
 from sys import argv, stdout
 from yaml import safe_dump, safe_load