git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32caee7
)
fix bugs
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 21 Apr 2009 18:00:20 +0000
(18:00 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 21 Apr 2009 18:00:20 +0000
(18:00 +0000)
geni/methods/list.py
patch
|
blob
|
history
diff --git
a/geni/methods/list.py
b/geni/methods/list.py
index
fe61f12
..
81c5e08
100644
(file)
--- a/
geni/methods/list.py
+++ b/
geni/methods/list.py
@@
-27,18
+27,18
@@
class list(Method):
def call(self, cred, hrn):
self.api.auth.check(cred, 'list')
def call(self, cred, hrn):
self.api.auth.check(cred, 'list')
- # is this a foreign authority
- if not hrn.startswith(self.api.hrn):
- registries = Registries(self.api)
+ try:
+ if not self.api.auth.hierarchy.auth_exists(hrn):
+ raise MissingAuthority(hrn)
+ table = self.api.auth.get_auth_table(hrn)
+ records = table.list()
+ except MissingAuthority:
+ # is this a foreign authority
+ registries = Registries(self.api)
credential = self.api.getCredential()
for registry in registries:
credential = self.api.getCredential()
for registry in registries:
- if hrn.startswith(registry):
+ if hrn.startswith(registry)
and registry not in [self.api.hrn]
:
records = registries[registry].list(credential, hrn)
records = registries[registry].list(credential, hrn)
- return records
-
- if not self.api.auth.hierarchy.auth_exists(hrn):
- raise MissingAuthority(hrn)
- table = self.api.auth.get_auth_table(hrn)
- records = table.list()
+ return records
return records
return records