From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 2 Jun 2008 08:12:38 +0000 (-0400)
Subject: Use default version of python (currently 2.4), not 2.5.
X-Git-Tag: sipb-xen-remote-server/0.2~21
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/6ef246a25f8748d23b9ff4335e5712bc34d5ae2b

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

svn path=/trunk/packages/sipb-xen-remote-server/; revision=562
---

diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms
index eaefffd..e3dfb94 100755
--- 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
@@ -6,7 +6,20 @@ suite.
 """
 
 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