s/CDumper/CSafeDumper/, because it's "Safe"?

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

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

-from itertools import chain
-from subprocess import CalledProcessError, PIPE, Popen
-from sys import argv, stdout
-from yaml import safe_dump, safe_load
+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

 
 ###
 
 
 ###
 

@@ -24,16 +36,16 @@ def main(argv):
     for p in pipes:
         if p.returncode != 0:
             raise CalledProcessError(p.returncode, cmd)
     for p in pipes:
         if p.returncode != 0:
             raise CalledProcessError(p.returncode, cmd)

-    results = [safe_load(o) for o in outputs]
+    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)
     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__':
 
 if __name__ == '__main__':

-    main(argv)
+    main(sys.argv)

 
 # vim:et:sw=2:ts=4
 
 # vim:et:sw=2:ts=4