X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/c4b92a9a114db5f996a31a97852b133f7d34aa94..d8c96686c66f6078a2c63835ff68f114a4e8dacc:/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 106cc47..1bb22fb 100755
--- 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:
-            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)
 
@@ -43,9 +43,10 @@ def main(argv):
     merged = {}
     for result in results:
         merged.update(result)
+
     print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
 
 if __name__ == '__main__':
     main(sys.argv)
 
-# vim:et:sw=2:ts=4
+# vim:et:sw=4:ts=4