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

clean up old code

Browse source
This commit is contained in:
Jonathan Wren 2022-03-12 14:57:21 -08:00
parent c7c6ecfdf9
commit 0d823155d0
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
jrnl/upgrade.py
View file

@ -124,7 +124,7 @@ older versions of jrnl anymore.
cont = yesno("\nContinue upgrading jrnl?", default=False) cont = yesno("\nContinue upgrading jrnl?", default=False)
if not cont: if not cont:
raise JrnlException(JrnlExceptionMessage.UpgradeAborted) raise JrnlException(Message(MsgText.UpgradeAborted), MsgType.WARNING)
for journal_name, path in encrypted_journals.items(): for journal_name, path in encrypted_journals.items():
print( print(
@ -155,9 +155,14 @@ older versions of jrnl anymore.
print_msg("Aborting upgrade.", msg=Message.NORMAL) print_msg("Aborting upgrade.", msg=Message.NORMAL)
raise JrnlException( raise JrnlException(
JrnlExceptionMessage.JournalFailedUpgrade, Message(
s="s" if len(failed_journals) > 1 else "", MsgText.JournalFailedUpgrade,
failed_journals="\n".join(j.name for j in failed_journals), MsgType.ERROR,
{
"s": "s" if len(failed_journals) > 1 else "",
"failed_journals": "\n".join(j.name for j in failed_journals),
},
)
) )
# write all journals - or - don't # write all journals - or - don't