git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de4f9ce
)
- NULL out invalid creator_person_ids
author
Mark Huang
<mlhuang@cs.princeton.edu>
Wed, 31 Jan 2007 20:57:28 +0000
(20:57 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Wed, 31 Jan 2007 20:57:28 +0000
(20:57 +0000)
PLC/Methods/RefreshPeer.py
patch
|
blob
|
history
diff --git
a/PLC/Methods/RefreshPeer.py
b/PLC/Methods/RefreshPeer.py
index
a022161
..
eab5ad5
100644
(file)
--- a/
PLC/Methods/RefreshPeer.py
+++ b/
PLC/Methods/RefreshPeer.py
@@
-351,7
+351,10
@@
class RefreshPeer(Method):
if slice['instantiation'] not in slice_instantiations:
errors.append("invalid instantiation %s" % slice['instantiation'])
if slice['creator_person_id'] not in peer_persons:
if slice['instantiation'] not in slice_instantiations:
errors.append("invalid instantiation %s" % slice['instantiation'])
if slice['creator_person_id'] not in peer_persons:
- errors.append("invalid creator %d" % slice['creator_person_id'])
+ # Just NULL it out
+ slice['creator_person_id'] = None
+ else:
+ slice['creator_person_id'] = peer_persons[slice['creator_person_id']]['person_id']
if errors:
print >> log, "Warning: Skipping invalid %s slice:" % peer['peername'], \
slice, ":", ", ".join(errors)
if errors:
print >> log, "Warning: Skipping invalid %s slice:" % peer['peername'], \
slice, ":", ", ".join(errors)
@@
-359,7
+362,6
@@
class RefreshPeer(Method):
continue
else:
slice['site_id'] = peer_sites[slice['site_id']]['site_id']
continue
else:
slice['site_id'] = peer_sites[slice['site_id']]['site_id']
- slice['creator_person_id'] = peer_persons[slice['creator_person_id']]['person_id']
# Synchronize new set
peer_slices = sync(old_peer_slices, slices_at_peer, Slice)
# Synchronize new set
peer_slices = sync(old_peer_slices, slices_at_peer, Slice)