From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 24 Aug 2009 14:22:40 +0000 (+0000)
Subject: add try/except aound BindObjectToPeer when object type is key
X-Git-Tag: sfa-0.9-1~49
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bf66533a92c2783fe8f8bd90076fa89a2e6e0441;p=sfa.git

add try/except aound BindObjectToPeer when object type is key
---

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index 98a24c6c..af405627 100644
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -289,8 +289,11 @@ class Slices(SimpleStorage):
                         self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer)
                     key_id=self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
                     if peer:
-			 self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
-			 self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0))
+                        self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
+                        # BindObjectToPeer may faill if type is key and it's already bound to the peer
+                        # so lets just put a try/except here
+                        try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0))
+                        except: pass
 
         # find out where this slice is currently running
         nodelist = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])