fix: restoring site breaks when checking backup version (backport #26186) #26203
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* 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)
github-actions
bot
added
the
add-test-cases
|
🎉 This PR is included in version 15.25.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.This is an automatic backport of pull request #26186 done by Mergify.