From: Greg Price <price@mit.edu>
Date: Sat, 21 Jun 2008 22:41:20 +0000 (-0400)
Subject: sx-remote-listvms: someone's uncommitted changes
X-Git-Tag: sipb-xen-remote-server/0.2~15
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/9510f1a322005bf54d9423821f884fea5958a0ac

sx-remote-listvms: someone's uncommitted changes

svn path=/trunk/packages/sipb-xen-remote-server/; revision=616
---

diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms
index 106cc47..52f5da6 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,6 +43,7 @@ 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__':