sx-remote-listvms: someone's uncommitted changes

[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 e3dfb94..52f5da6 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -5,7 +5,6 @@ Collates the results of listvms from multiple VM servers.  Part of the xvm
 suite.
 """
 
 suite.
 """
 

-from itertools import chain

 from subprocess import PIPE, Popen
 try:
     from subprocess import CalledProcessError
 from subprocess import PIPE, Popen
 try:
     from subprocess import CalledProcessError

@@ -20,8 +19,8 @@ except ImportError:
             self.cmd = cmd
         def __str__(self):
             return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.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 +35,18 @@ def main(argv):
     outputs = [p.communicate()[0] for p in pipes]
     for p in pipes:
         if p.returncode != 0:
     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 CalledProcessError(p.returncode, 'remctl')
+    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