Changeset 562 for trunk

Timestamp:

Jun 2, 2008, 4:12:38 AM (16 years ago)

Author:

andersk

Message:

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

File:

• trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms (modified) (2 diffs)

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms

@@ -1 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/python
 
 """
@@ -7 +7 @@
 
 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