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
Follow up to #587.
The
dnf install -y <local_file>
action will not reinstall a packageif the versions are the same. Since we expect package contents to
change, but not version strings, when running
make clone
, let's makesure to uninstall the rpm package in dom0 so that the install action
always takes effect.
Testing
First, let's observe the problem. The steps to reproduce assume that you've already got a version of `securedrop-workstation-config
make clone && make prep-dev
. This is just to confirm that you've got a recent version of the rpm already presentsudo ls -1 /srv/salt/ | grep sd-test
shows nothingtouch dom0/sd-test.sls
to create a new filemake clone && make prep-dev
sudo ls -1 /srv/salt/ | grep sd-test
shows nothingNow let's test the fix.
git status
and confirmdom0/sd-test.sls
is still present locally (you don't need to commit it)sudo ls -1 /srv/salt/ | grep sd-test
shows nothingmake clone && make prep-dev
sudo ls -1 /srv/salt/ | grep sd-test
shows "sd-test.sls"Checklist
If you have made code changes
make flake8
) passes in the development environment (this box maybe left unchecked, as
flake8
also runs in CI)If you have made changes to the provisioning logic
All tests (
make test
) pass indom0
of a Qubes installThis PR adds/removes files, and includes required updates to the packaging
logic in
MANIFEST.in
andrpm-build/SPECS/securedrop-workstation-dom0-config.spec