From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 1 Feb 2007 21:55:59 +0000 (+0000)
Subject: - tickets do not have 'node_id' in them
X-Git-Tag: planetlab-4_0-rc1~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9de6f941e91044c6969cb30b6d63e14291be9fd1;p=nodemanager.git

- tickets do not have 'node_id' in them
---

diff --git a/sm.py b/sm.py
index bbf3b9f..2d88151 100644
--- a/sm.py
+++ b/sm.py
@@ -50,7 +50,7 @@ def GetSlivers(data, fullupdate=True):
         finally: f.close()
     except: logger.log_exc()
 
-    if data['node_id'] != node_id: return
+    if data.has_key('node_id') and data['node_id'] != node_id: return
     for sliver in data['slivers']:
         rec = sliver.copy()
         rec.setdefault('timestamp', data['timestamp'])
@@ -88,7 +88,7 @@ def GetSlivers(data, fullupdate=True):
             accounts.get(name).start(delay=cumulative_delay)
             cumulative_delay += 3
 
-def deliver_ticket(data): return GetSlivers_callback(data, fullupdate=False)
+def deliver_ticket(data): return GetSlivers(data, fullupdate=False)
 
 
 def start(options, config):