From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 12 Jan 2010 02:49:28 +0000 (+0000)
Subject: fix package import
X-Git-Tag: sfa-0.9-9~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c927c88ac2d01fcebc3a4e98e7dff1c4408b39fa;p=sfa.git

fix package import
---

diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py
index 18e13e32..80dbc232 100644
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -12,7 +12,7 @@ from sfa.trust.certificate import Keypair
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.report import trace, error
 from sfa.server.registry import Registries
-from sfa.util.xmlrpcprotocol import *
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol 
 import socket
 
 def main():
@@ -60,7 +60,14 @@ def main():
             try:
                 records = registries[registry_hrn].resolve(credential, target_hrns)
                 found_records.extend([record['hrn'] for record in records])
+            except ServerException:
+                # an exception will be thrown if the record doenst exist
+                # if so remove the record from the local registry
+                continue
             except:
+                # this deosnt necessarily mean the records dont exist
+                # lets give them the benefit of the doubt here (for now)
+                found_records.extend(target_hrns)
                 traceback.print_exc()
 
     # remove what wasnt found