fix: restoring site breaks when checking backup version #26186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `backup_version` variable exists if and only if the `if match` branch executes, but it is used in a condition in a scope where it may not exist. Changing the variable to `match` leads to correct behaviour.
github-actions
bot
added
the
add-test-cases
akhilnarang
reviewed
Apr 29, 2024
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
akhilnarang
requested changes
Apr 29, 2024
No functional difference, just easier to understand/read the code. Signed-off-by: Akhil Narang <me@akhilnarang.dev>
akhilnarang
approved these changes
Apr 29, 2024
akhilnarang
added
backport version-15-hotfix
mergify bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
* fix: restoring site breaks when checking backup version The `backup_version` variable exists if and only if the `if match` branch executes, but it is used in a condition in a scope where it may not exist. Changing the variable to `match` leads to correct behaviour. * fix: restoring site breaks when checking backup version Co-authored-by: Akhil Narang <me@akhilnarang.dev> * fix: version check when restoring site should be done from `match` scope * chore: add a `return None` for better readability No functional difference, just easier to understand/read the code. Signed-off-by: Akhil Narang <me@akhilnarang.dev> --------- Signed-off-by: Akhil Narang <me@akhilnarang.dev> Co-authored-by: Akhil Narang <me@akhilnarang.dev> (cherry picked from commit 0576668)
akhilnarang
added a commit
that referenced
this pull request
Apr 29, 2024
…-26186 fix: restoring site breaks when checking backup version (backport #26186)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Apr 30, 2024
# [15.25.0](v15.24.1...v15.25.0) (2024-04-30) ### Bug Fixes * add missing impl for is_column_missing ([#26225](#26225)) ([#26227](#26227)) ([9490869](9490869)) * **ar:** render fullcalendar in english ([#26207](#26207)) ([#26210](#26210)) ([2f171cd](2f171cd)) * avoid perm error on dashboard chart ([#26150](#26150)) ([#26153](#26153)) ([0909589](0909589)) * **backup:** delete failed backup even if something fails during the backup process ([7c8c41c](7c8c41c)) * calendar in Arabic (backport [#26213](#26213)) ([#26216](#26216)) ([df6291b](df6291b)), closes [#26207](#26207) * clean up print ([#26170](#26170)) ([#26176](#26176)) ([a41e496](a41e496)) * Dirty form when grid rows are moved ([#26230](#26230)) ([#26234](#26234)) ([c60f25d](c60f25d)) * frappe.template.compile(...) is not a function ([#26125](#26125)) ([#26127](#26127)) ([69e503c](69e503c)) * handle case where mimetype is None ([#26131](#26131)) ([#26133](#26133)) ([0c518a2](0c518a2)) * handle null in CSV preview ([551503a](551503a)) * hide tab button on child table ([#26148](#26148)) ([#26149](#26149)) ([fd42cbf](fd42cbf)) * multistep webform page navigation ([9415f4f](9415f4f)) * perm query for dashboard ([#26239](#26239)) ([#26243](#26243)) ([9ffb8af](9ffb8af)) * Renaming when doctype is used as a virtual link docfield fails ([#26025](#26025)) ([#26119](#26119)) ([724f944](724f944)) * **report builder:** responsive footer ([#26222](#26222)) ([#26224](#26224)) ([f19bff7](f19bff7)) * **report_utils:** ensure that delimiter and separator can't be empty ([#26202](#26202)) ([a1f008c](a1f008c)) * restoring site breaks when checking backup version ([#26186](#26186)) ([f2f167d](f2f167d)) * retry count per doc instead of global ([#26159](#26159)) ([#26161](#26161)) ([256578a](256578a)) * use document language for workflow action ([#26138](#26138)) ([#26139](#26139)) ([876d230](876d230)) * **UX:** warning when printing unsaved documents ([#26229](#26229)) ([#26232](#26232)) ([8826690](8826690)) * web form filtering ([#26122](#26122)) ([0c38f94](0c38f94)) ### Features * Allow usage of `print()` within `safe_exec()` ([#23084](#23084)) ([3ce15f3](3ce15f3)) * Allow user to optimize tables ([#26109](#26109)) ([#26121](#26121)) ([ca7148e](ca7148e)) * Document.remove_tag ([#22970](#22970)) ([#26178](#26178)) ([17ca7f4](17ca7f4)) * limit oauth client to roles (backport [#26193](#26193)) ([#26196](#26196)) ([c8387f8](c8387f8)) ### Performance Improvements * use base32 space for random names instead of base16 (backport [#25497](#25497)) ([#25546](#25546)) ([0723853](0723853))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When restoring a site from a backup SQL file, the restore fails due to an error when checking the version of the backup file. The
backup_versionvariable exists if and only if theif matchbranch executes, but it is used in a condition in a scope where it may not exist. Changing the variable tomatchleads to correct behaviour.