From: Tony Mack Date: Mon, 9 Aug 2010 20:20:59 +0000 (+0000) Subject: pass the gid's filename instead f the gid object to Credential.delegate X-Git-Tag: sfa-1.0-0~48 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a779ea4dced5a28e74addbc74f178303b29a1fcc pass the gid's filename instead f the gid object to Credential.delegate --- diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index dd3a5f69..37324f38 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -559,23 +559,20 @@ class Sfi: return records = self.registry.Resolve(args[0], user_cred.save_to_string(save_parents=True)) - records = filter_records("user", records) - if not records: - print "Error: Didn't find a user record for", args[0] - return - + raise RecordNotFound(args[0]) # the gid of the user who will be delegated to delegee_gid = GID(string=records[0]['gid']) delegee_hrn = delegee_gid.get_hrn() - - dcred = object_cred.delegate(delegee_gid, self.get_key_file()) + delegee_gidfile = os.path.join(self.options.sfi_dir, delegee_hrn + ".gid") + delegee_gid.save_to_file(filename=delegee_gidfile) + dcred = object_cred.delegate(delegee_gidfile, self.get_key_file()) if opts.delegate_user: dest_fn = os.path.join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_" + get_leaf(object_hrn) + ".cred") elif opts.delegate_slice: - dest_fn = os.path_join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_slice_" + dest_fn = os.path.join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_slice_" + get_leaf(object_hrn) + ".cred") dcred.save_to_file(dest_fn, save_parents=True)