From c7237769c91abcb6f2f338ba0f1b67f02daceede Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 6 Sep 2011 14:48:52 +0200 Subject: [PATCH] bugfix, in multi-dirs mode this was always using ~/.sfi/ to look for cached version --- sfa/client/sfi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: -- 2.47.0