From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 23 Mar 2009 13:32:00 +0000 (+0000)
Subject: bug in loadCredential(), commented out for now
X-Git-Tag: sfa-0.9-0@14641~554
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a5d41c1efac138a94a114f42be5612cd7b663714;p=sfa.git

bug in loadCredential(), commented out for now
---

diff --git a/geni/registry.py b/geni/registry.py
index e792c552..b33f3b8f 100644
--- a/geni/registry.py
+++ b/geni/registry.py
@@ -113,7 +113,7 @@ class Registry(GeniServer):
         self.registry_info = XmlStorage(registries_file, {'registries': {'registry': [connection_dict]}})
         self.registry_info.load()
         self.connectRegistry()
-        self.loadCredential()
+        #self.loadCredential()
         self.connectRegistries()
         
  
@@ -765,8 +765,15 @@ class Registry(GeniServer):
 
     def resolve(self, cred, name):
         self.decode_authentication(cred, "resolve")
-
-        records = self.resolve_raw("*", name)
+        
+        try:
+            records = self.resolve_raw("*", name)
+        except RecordNotFound:
+            records = []
+            for registry in self.registries:
+                if name.startswith(registry):
+                    records = self.registries[registry].resolve(cred, name)
+  
         dicts = []
         for record in records:
             dicts.append(record.as_dict())