From 0d823155d0e2c21a3b05144f49299fee7f057651 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 12 Mar 2022 14:57:21 -0800 Subject: [PATCH] clean up old code --- jrnl/upgrade.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index 60fcfffa..3027f4e7 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -124,7 +124,7 @@ older versions of jrnl anymore. cont = yesno("\nContinue upgrading jrnl?", default=False) if not cont: - raise JrnlException(JrnlExceptionMessage.UpgradeAborted) + raise JrnlException(Message(MsgText.UpgradeAborted), MsgType.WARNING) for journal_name, path in encrypted_journals.items(): print( @@ -155,9 +155,14 @@ older versions of jrnl anymore. print_msg("Aborting upgrade.", msg=Message.NORMAL) raise JrnlException( - JrnlExceptionMessage.JournalFailedUpgrade, - s="s" if len(failed_journals) > 1 else "", - failed_journals="\n".join(j.name for j in failed_journals), + Message( + MsgText.JournalFailedUpgrade, + 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