aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes config updater robust ton undefined values.

Browse Source
This commit is contained in:
Olivier Mangin 2015-12-09 10:56:01 -05:00
parent 796087af45
commit 0bfe921ad9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pubs/update.py
View File

@ -42,10 +42,11 @@ def update(conf, code_version, repo_version, path=None):
default_conf = config.load_default_conf() default_conf = config.load_default_conf()
for key in ['pubsdir', 'docsdir', 'edit_cmd', 'open_cmd']: for key in ['pubsdir', 'docsdir', 'edit_cmd', 'open_cmd']:
default_conf['main'][key] = conf['pubs'][key] if key in conf['pubs']:
if conf['pubs']['import_move']: default_conf['main'][key] = conf['pubs'][key]
if conf.get('import_move'):
default_conf['main']['add_doc'] = 'move' default_conf['main']['add_doc'] = 'move'
elif conf['pubs']['import_copy']: elif conf.get('import_copy'):
default_conf['main']['add_doc'] = 'copy' default_conf['main']['add_doc'] = 'copy'
else: else:
default_conf['main']['add_doc'] = 'link' default_conf['main']['add_doc'] = 'link'