fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-21 05:28:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix twice version validation

Browse source
This commit is contained in:
wotgl 2020-05-23 18:48:34 +03:00
parent 4df9b2b375
commit 29e67bbcef
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jrnl/install.py
View file

@ -100,7 +100,7 @@ def load_or_install_jrnl():
from . import upgrade from . import upgrade
try: try:
upgrade.upgrade_jrnl_if_necessary(config_path) upgrade.upgrade_jrnl(config_path)
except upgrade.UpgradeValidationException: except upgrade.UpgradeValidationException:
print("Aborting upgrade.", file=sys.stderr) print("Aborting upgrade.", file=sys.stderr)
print( print(

7
jrnl/upgrade.py
View file

@ -34,12 +34,7 @@ def check_exists(path):
return os.path.exists(path) return os.path.exists(path)
def upgrade_jrnl_if_necessary(config_path): def upgrade_jrnl(config_path):
with open(config_path, "r", encoding="utf-8") as f:
config_file = f.read()
if not config_file.strip().startswith("{"):
return
config = util.load_config(config_path) config = util.load_config(config_path)
print( print(

5
jrnl/util.py
View file

@ -126,10 +126,7 @@ def load_config(config_path):
def is_config_json(config_path): def is_config_json(config_path):
with open(config_path, "r", encoding="utf-8") as f: with open(config_path, "r", encoding="utf-8") as f:
config_file = f.read() config_file = f.read()
if not config_file.strip().startswith("{"): return config_file.strip().startswith("{"):
return False
return True
def is_old_version(config_path): def is_old_version(config_path):