[stable22] Downstream encryption:fix-encrypted-version for repairing "bad signature" errors #27726
Conversation
This file contains hidden or 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
For fixing "Bad signature" errors. Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
When running occ encryption:fix-encrypted-version, detect whether the setting 'encryption_skip_signature_check' is set and abort if it is, because the repair cannot detect version mismatch errors with it enabled. Signed-off-by: Vincent Petry <[email protected]>
Fixed code warnings Signed-off-by: Vincent Petry <[email protected]>
Fixed setup to use EncryptionTrait like other existing tests. Fix expectations to not rely on side effects from previous test cases. Signed-off-by: Vincent Petry <[email protected]>
Return an error when running occ encryption:fix-encrypted-version when master key encryption is not enabled. Signed-off-by: Vincent Petry <[email protected]>
backportbot-nextcloud
bot
requested review from
PVince81,
icewind1991,
juliusknorr,
kesselb and
skjnldsv
skjnldsv
approved these changes
Jun 30, 2021
Member
|
@skjnldsv did you resolve the conflict ? there is no message or status that makes it explicitly obvious whether the conflict is still there or not or if some conflict code got discarded. usually when I resolve a conflict I post a message "resolved conflict, it was about XYZ" |
Member
|
There was no conflict 🤔 |
Member
I received an email for #27638 (comment), but not the comment is hidden, so not sure what happened. |
Member
I asked for a backport on stable22 again. It got processed twice, second one failed, sorry :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
backport of #27638