Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Confirm that each journal can be parsed during upgrade, and abort upgrade if not #650

Merged
merged 5 commits into from
Aug 24, 2019
Merged

Confirm that each journal can be parsed during upgrade, and abort upgrade if not #650

merged 5 commits into from
Aug 24, 2019

Conversation

micahellison
Copy link
Member

And aborting upgrade if not.

This change also moves upgrade-related tests into their own upgrade.feature file.

Copy link
Member

@wren wren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one change.

jrnl/upgrade.py Outdated
)

util.prompt("Aborting upgrade.")
return
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use an exception here instead of returning. Once this function returns, a bunch of other code will still run (like upgrading the config), and not fully abort the upgrade.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - just made the change.

Handling it in install.py to prevent config from being overwritten when upgrade fails
@wren wren added the bug Something isn't working label Aug 24, 2019
@wren wren added this to the v2.0-rc4 milestone Aug 24, 2019
util.prompt("Aborting upgrade. Exiting.")
util.prompt("Aborting upgrade.")
util.prompt("Please tell us about this problem at the following URL:")
util.prompt("https://github.com/jrnl-org/jrnl/issues/new?title=UpgradeValidationException")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

Copy link
Member

@wren wren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

@wren wren merged commit 2767567 into jrnl-org:master Aug 24, 2019
@micahellison micahellison changed the title [GH-632] confirming that each journal can be parsed during upgrade Confirm that each journal can be parsed during upgrade, and abort upgrade if not Jan 11, 2020
@lock
Copy link

lock bot commented May 21, 2020

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot added the 🔒 Outdated label May 21, 2020
@lock lock bot locked as resolved and limited conversation to collaborators May 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working 🔒 Outdated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants