From c3ea74b41d43ca0dd2d5f912381df5a5732fbf62 Mon Sep 17 00:00:00 2001
From: Anil-Kumar Vengalil <Anil-Kumar.Vengalil@sophia.inria.fr>
Date: Thu, 17 Dec 2009 15:36:27 +0000
Subject: [PATCH] cosmetic
---
sfa/methods/remove.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index 3d7d5d3d..b9dd9bde 100644
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -36,11 +36,6 @@ class remove(Method):
returns = Parameter(int, "1 if successful")
def call(self, cred, type, hrn, request_hash=None, origin_hrn=None):
-
- if origin_hrn==None:
- origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
- #log the call
- self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
# This cred will be an authority cred, not a user, so we cant use it to
# authenticate the caller's request_hash. Let just get the caller's gid
# from the cred and authenticate using that
@@ -49,6 +44,12 @@ class remove(Method):
self.api.auth.authenticateGid(client_gid_str, [cred, type, hrn], request_hash)
self.api.auth.check(cred, "remove")
self.api.auth.verify_object_permission(hrn)
+
+ if origin_hrn==None:
+ origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+
+ #log the call
+ self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
table = GeniTable()
filter = {'hrn': hrn}
if type not in ['all', '*']:
--
2.47.0