fix a race in listvms when a machine is shutting down

Also tell the remctl-auto changelog about YAML support.

svn path=/trunk/packages/sipb-xen-remctl-auto/; revision=712

diff --git a/debian/changelog b/debian/changelog
index 82f6cec..7d4f3c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-remctl-auto (1.0.16) unstable; urgency=low
+
+  * support YAML as well as JSON (broder, quentin, andersk, long ago)
+  * fix a race in listvms when a machine is shutting down
+
+ -- Greg Price <price@mit.edu>  Tue, 22 Jul 2008 23:46:49 -0400
+

 sipb-xen-remctl-auto (1.0.15) unstable; urgency=low
 
   * Compute time differences on server to avoid drift
 sipb-xen-remctl-auto (1.0.15) unstable; urgency=low
 
   * Compute time differences on server to avoid drift

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 3c8b0a1..04dfc20 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -16,7 +16,7 @@ def live_vms():
     for domid in domids:
         try:
             name, data = get_dom(int(domid))
     for domid in domids:
         try:
             name, data = get_dom(int(domid))

-        except ValueError:
+        except TypeError:

             continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]
             continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]