From 9510f1a322005bf54d9423821f884fea5958a0ac Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 21 Jun 2008 18:41:20 -0400 Subject: [PATCH 1/1] sx-remote-listvms: someone's uncommitted changes svn path=/trunk/packages/sipb-xen-remote-server/; revision=616 --- files/usr/sbin/sipb-xen-remote-listvms | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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__': -- 1.7.9.5