From cc26ffeaf200e7e1c4fd8a78097b782ce1746391 Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Thu, 10 Sep 2020 17:13:50 -0700 Subject: [PATCH] Uninstalls RPM in prep-dev script Follow up to #587. The `dnf install -y ` action will not reinstall a package if the versions are the same. Since we expect package contents to change, but not version strings, when running `make clone`, let's make sure to uninstall the rpm package in dom0 so that the install action always takes effect. --- scripts/prep-dev | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/prep-dev b/scripts/prep-dev index 36eba56d..1af34e1c 100755 --- a/scripts/prep-dev +++ b/scripts/prep-dev @@ -21,6 +21,8 @@ if [[ -z "$latest_rpm" ]]; then fi echo "Deploying Salt config..." +echo "Uninstalling any previous RPM versions..." +sudo dnf remove -y securedrop-worsktation-dom0-config || true echo "Installing RPM at $latest_rpm ..." sudo dnf install -y "$latest_rpm"