X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/6ef246a25f8748d23b9ff4335e5712bc34d5ae2b..ed9def75e564a551201fd64e338eda4c12fab5be:/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 e3dfb94..81722e9 100755
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -5,23 +5,9 @@ Collates the results of listvms from multiple VM servers.  Part of the xvm
 suite.
 """
 
-from itertools import chain
 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
+import sys
+import yaml
 
 ###
 
@@ -36,17 +22,19 @@ def main(argv):
     outputs = [p.communicate()[0] for p in pipes]
     for p in pipes:
         if p.returncode != 0:
-            raise CalledProcessError(p.returncode, cmd)
-    results = [safe_load(o) for o in outputs]
+            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)
 
     # Merge the results and print.
     merged = {}
     for result in results:
         merged.update(result)
-    print safe_dump(merged, default_flow_style=False)
+
+    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
 
 if __name__ == '__main__':
-    main(argv)
+    main(sys.argv)
 
-# vim:et:sw=2:ts=4
+# vim:et:sw=4:ts=4