diff --git a/jrnl/messages.py b/jrnl/messages.py index 2341960e..1da61e55 100644 --- a/jrnl/messages.py +++ b/jrnl/messages.py @@ -131,6 +131,8 @@ class MsgText(Enum): UpgradeAborted = "jrnl was NOT upgraded" + AbortingUpgrade = "Aborting upgrade..." + ImportAborted = "Entries were NOT imported" # -- Config --- # diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index 3027f4e7..f8ddb275 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -152,9 +152,8 @@ older versions of jrnl anymore. failed_journals = [j for j in all_journals if not j.validate_parsing()] if len(failed_journals) > 0: - print_msg("Aborting upgrade.", msg=Message.NORMAL) - raise JrnlException( + Message(MsgText.AbortingUpgrade, MsgType.WARNING), Message( MsgText.JournalFailedUpgrade, MsgType.ERROR, @@ -162,7 +161,7 @@ older versions of jrnl anymore. "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