From a5d41c1efac138a94a114f42be5612cd7b663714 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 23 Mar 2009 13:32:00 +0000 Subject: [PATCH] bug in loadCredential(), commented out for now --- geni/registry.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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()) -- 2.43.0