fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-09 09:06:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disambiguates jrnl.update_config and install.update_config

Browse source
This commit is contained in:
Manuel Ebert 2013-10-17 16:00:27 -07:00
parent 34b730a5c9
commit a96435b6dc
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jrnl/jrnl.py
View file

@ -109,7 +109,7 @@ def touch_journal(filename):
def update_config(config, new_config, scope):
"""Updates a config dict with new values - either global if scope is None
of config['journals'][scope] is just a string pointing to a journal file,
or config['journals'][scope] is just a string pointing to a journal file,
or within the scope"""
if scope and type(config['journals'][scope]) is dict: # Update to journal specific
config['journals'][scope].update(new_config)
@ -127,7 +127,7 @@ def cli(manual_args=None):
util.prompt("[There seems to be something wrong with your jrnl config at {0}: {1}]".format(CONFIG_PATH, e.message))
util.prompt("[Entry was NOT added to your journal]")
sys.exit(1)
install.update_config(config, config_path=CONFIG_PATH)
install.upgrade_config(config, config_path=CONFIG_PATH)
original_config = config.copy()
# check if the configuration is supported by available modules