From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Sep 2011 12:48:52 +0000 (+0200)
Subject: bugfix, in multi-dirs mode this was always using ~/.sfi/ to look for
X-Git-Tag: sfa-1.0-36~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c7237769c91abcb6f2f338ba0f1b67f02daceede;p=sfa.git

bugfix, in multi-dirs mode this was always using ~/.sfi/ to look for
cached version
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 764ce18c..ca579c90 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -136,6 +136,8 @@ class Sfi:
         for opt in Sfi.required_options:
             if not hasattr(options,opt): setattr(options,opt,None)
         if not hasattr(options,'sfi_dir'): options.sfi_dir=os.path.expanduser("~/.sfi/")
+        # xxx oops, this is dangerous, sounds like ww sometimes have discrepency
+        # would be safer to remove self.sfi_dir altogether
         self.sfi_dir = options.sfi_dir
         self.options = options
         self.slicemgr = None
@@ -284,7 +286,7 @@ class Sfi:
         
 
     def read_config(self):
-       config_file = self.options.sfi_dir + os.sep + "sfi_config"
+       config_file = os.path.join(self.options.sfi_dir,"sfi_config")
        try:
           config = Config (config_file)
        except: