From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 18 Jul 2012 15:31:53 +0000 (-0400)
Subject: fix bug in main()
X-Git-Tag: sfa-2.1-14~96^2~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e7598be9f9147f2ac012c27f4a8b00ae42d3b663

fix bug in main()
---

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index e5a04e4c..0b708e2d 100755
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -514,15 +514,10 @@ def main(command,argv,configuration):
 
     # local settings only, will be modified & saved
     config_filename = "%s/sfa_config" % config.config_dir
-    try:
-        cwrite=Config(config_filename)
-    except ConfigParser.MissingSectionHeaderError:
-        # remove legacy config 
-        os.unlink(config_filename)
-        cwrite=Config(config_filename)
-
+    cwrite=Config(config_filename)
     try:
         cread.load(site_config)
+        cwrite.load(default_config)
         cwrite.load(site_config)
     except:
         cwrite = Config()