Hotfix for missing config attribute issue. #5760
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
Bring back the try/except blocks needed to support long-running instance configurations that may lack newer attributes. (cherry picked from commit accad09)
zenmonkeykstop
requested review from
conorsch,
emkll,
kushaldas and
redshiftzero
as code owners
conorsch
approved these changes
Jan 27, 2021
|
Associated docs PR is here: freedomofpress/securedrop-docs#142 |
emkll
reviewed
Jan 27, 2021
| @@ -1,3 +1,9 @@ | |||
| securedrop-app-code (1.7.1+focal) focal; urgency=medium | |||
There was a problem hiding this comment.
We will need to clean this up in 1.8.0, as we didn't release 1.7.1 for focal
|
The test failures in admin-tests here: https://app.circleci.com/pipelines/github/freedomofpress/securedrop/1760/workflows/46441d05-f6f1-45f4-8b90-24a72c05a54a/jobs/49540 appear to be related to the fact that we're bumping the version and creating a tag in a single pass, as part of this release. @zenmonkeykstop Does that sound right to you? If so, I suggest we disregard that particular failure and press on. |
emkll
approved these changes
Jan 28, 2021
|
Agreed. The Focal-only test failures are consistent with what we saw in #5753 (comment), so proceeding with merge. |
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.
Status
Ready for review
Description of Changes
Fixes #5757.
Hotfix PR for missing config attribute issue - contains both the backported fix from #5759 and version/changelog updates (to save CI wall time).
Testing
release/1.7.1Deployment
Checklist
If you made changes to the server application code:
make lint) and tests (make test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you added or removed a file deployed with the application:
If you made non-trivial code changes:
Choose one of the following:
If you added or updated a code dependency:
Choose one of the following: