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 55f8fd9..52f5da6 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -35,7 +35,7 @@ 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)
+            raise CalledProcessError(p.returncode, 'remctl')

     results = [yaml.load(o, yaml.CSafeLoader) for o in outputs]
     results = filter(lambda x: x is not None, results)
 
     results = [yaml.load(o, yaml.CSafeLoader) for o in outputs]
     results = filter(lambda x: x is not None, results)
 

@@ -43,7 +43,8 @@ def main(argv):
     merged = {}
     for result in results:
         merged.update(result)
     merged = {}
     for result in results:
         merged.update(result)

-    print yaml.dump(merged, Dumper=yaml.CDumper, default_flow_style=False)
+
+    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)

 
 if __name__ == '__main__':
     main(sys.argv)
 
 if __name__ == '__main__':
     main(sys.argv)