From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 15 Jul 2009 09:18:08 +0000 (+0000)
Subject: oops, sfi_dir now in options
X-Git-Tag: sfa-0.9-0@14641~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8f79f97d6ec8cbae4ca287d8efc14e2c167f8d04;p=sfa.git

oops, sfi_dir now in options
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 7cb21b9f..f55c66e2 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -453,10 +453,10 @@ class Sfi:
        dcred.sign()
     
        if opts.delegate_user:
-           dest_fn = os.path.join(self.sfi_dir, self.get_leaf(delegee_hrn) + "_" 
+           dest_fn = os.path.join(self.options.sfi_dir, self.get_leaf(delegee_hrn) + "_" 
                                   + self.get_leaf(object_hrn) + ".cred")
        elif opts.delegate_slice:
-           dest_fn = os.path_join(self.sfi_dir, self.get_leaf(delegee_hrn) + "_slice_" 
+           dest_fn = os.path_join(self.options.sfi_dir, self.get_leaf(delegee_hrn) + "_slice_" 
                                   + self.get_leaf(object_hrn) + ".cred")
     
        dcred.save_to_file(dest_fn, save_parents = True)
@@ -606,7 +606,7 @@ class Sfi:
     
     def save_rspec_to_file(self,rspec, filename):
        if not filename.startswith(os.sep):
-           filename = self.sfi_dir + filename
+           filename = self.options.sfi_dir + filename
        if not filename.endswith(".rspec"):
            filename = filename + ".rspec"
     
@@ -646,7 +646,7 @@ class Sfi:
     
     def save_record_to_file(self,filename, record):
        if not filename.startswith(os.sep):
-           filename = self.sfi_dir + filename
+           filename = self.options.sfi_dir + filename
        str = record.save_to_string()
        file(filename, "w").write(str)
        return