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

update upgrade module to properly use new message and exception handling

Browse source
This commit is contained in:
Jonathan Wren 2022-05-01 04:10:20 -07:00
parent 8088083737
commit 9c030ac790
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jrnl/messages.py
View file

@ -131,6 +131,8 @@ class MsgText(Enum):
UpgradeAborted = "jrnl was NOT upgraded" UpgradeAborted = "jrnl was NOT upgraded"
AbortingUpgrade = "Aborting upgrade..."
ImportAborted = "Entries were NOT imported" ImportAborted = "Entries were NOT imported"
# -- Config --- # # -- Config --- #

5
jrnl/upgrade.py
View file

@ -152,9 +152,8 @@ older versions of jrnl anymore.
failed_journals = [j for j in all_journals if not j.validate_parsing()] failed_journals = [j for j in all_journals if not j.validate_parsing()]
if len(failed_journals) > 0: if len(failed_journals) > 0:
print_msg("Aborting upgrade.", msg=Message.NORMAL)
raise JrnlException( raise JrnlException(
Message(MsgText.AbortingUpgrade, MsgType.WARNING),
Message( Message(
MsgText.JournalFailedUpgrade, MsgText.JournalFailedUpgrade,
MsgType.ERROR, MsgType.ERROR,
@ -162,7 +161,7 @@ older versions of jrnl anymore.
"s": "s" if len(failed_journals) > 1 else "", "s": "s" if len(failed_journals) > 1 else "",
"failed_journals": "\n".join(j.name for j in failed_journals), "failed_journals": "\n".join(j.name for j in failed_journals),
}, },
) ),
) )
# write all journals - or - don't # write all journals - or - don't