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

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-listvms

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 427a586..7f6cb39 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -35,8 +35,12 @@ def get_dom(domid):
 
 if __name__ == '__main__':
     vms = live_vms()
-    if '--pickle' in sys.argv[1:]:
+    if '--json' in sys.argv[1:]:
+        import cjson
+        print cjson.encode(vms)
+    elif '--pickle' in sys.argv[1:]:
         import cPickle
         cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
     else:
-        print vms
+        import yaml
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)