Index: trunk/packages/sipb-xen-remctl-auto/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 531)
+++ trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 533)
@@ -1,2 +1,8 @@
+sipb-xen-remctl-auto (1.0.15) unstable; urgency=low
+
+  * Compute time differences on server to avoid drift
+
+ -- Quentin Smith <quentin@mit.edu>  Thu, 15 May 2008 20:58:04 -0400
+
 sipb-xen-remctl-auto (1.0.14) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 531)
+++ trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 533)
@@ -2,4 +2,5 @@
 
 import sys
+import time
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
@@ -9,5 +10,5 @@
 def live_vms():
     domids = set(trans.ls('', '/local/domain'))
-    domids.remove('0')
+    domids.discard('0')
 
     vms = dict()
@@ -29,4 +30,5 @@
     data['vm'] = trans.read('', '/local/domain/%d/vm' % domid)
     data['start_time'] = float(trans.read('', '%s/start_time' % data['vm']))
+    data['uptime'] = time.time()-data['start_time']
     
     return name, data
@@ -36,5 +38,5 @@
     if '--pickle' in sys.argv[1:]:
         import cPickle
-        cPickle.dump(vms, sys.stdout)
+        cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
     else:
         print vms