git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug in main()
[sfa.git]
/
config
/
sfa-config-tty
diff --git
a/config/sfa-config-tty
b/config/sfa-config-tty
index
e5a04e4
..
0b708e2
100755
(executable)
--- 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
# 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)
try:
cread.load(site_config)
+ cwrite.load(default_config)
cwrite.load(site_config)
except:
cwrite = Config()
cwrite.load(site_config)
except:
cwrite = Config()