Require config arguments

This commit is contained in:
Matthias Vogelgesang 2014-06-26 10:47:59 +02:00
parent fc1935d64e
commit fca3d131bd
2 changed files with 6 additions and 6 deletions

View file

@ -126,7 +126,7 @@ def run(manual_args=None):
config = install.install_jrnl(CONFIG_PATH)
else:
config = util.load_and_fix_json(CONFIG_PATH)
install.upgrade_config(config, config_path=CONFIG_PATH)
install.upgrade_config(config, CONFIG_PATH)
if args.ls:
print(util.py2encode(list_journals(config)))
@ -235,14 +235,14 @@ def run(manual_args=None):
# Not encrypting to a separate file: update config!
if not args.encrypt:
update_config(original_config, {"encrypt": True}, journal_name, force_local=True)
install.save_config(original_config, config_path=CONFIG_PATH)
install.save_config(original_config, CONFIG_PATH)
elif args.decrypt is not False:
decrypt(journal, filename=args.decrypt)
# Not decrypting to a separate file: update config!
if not args.decrypt:
update_config(original_config, {"encrypt": False}, journal_name, force_local=True)
install.save_config(original_config, config_path=CONFIG_PATH)
install.save_config(original_config, CONFIG_PATH)
elif args.edit:
if not config['editor']: