From 081c68c27f64c78d298c836acaf98ab191137e04 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Tue, 7 Feb 2023 15:46:12 +0200 Subject: [PATCH] dev_scripts: Alter the shadow-utils fix Instead of reinstalling shadow-utils, use the actual fix that the Fedora devs have suggested (rpm --restore shadow-utils). The previous method does not seem to work on Fedora 37, and it threw the following error when building the development environment: Installed package shadow-utils-2:4.12.3-3.fc37.x86_64 (from koji-override-0) not available. Error: No packages marked for reinstall. Error: building at STEP "RUN dnf reinstall -y shadow-utils && dnf clean all": while running runtime: exit status 1 --- dev_scripts/env.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_scripts/env.py b/dev_scripts/env.py index baa2470..8002084 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -74,7 +74,7 @@ RUN dnf install -y rpm-build podman python3 make python3-pip qt5-qtbase-gui \ # FIXME: Drop this fix after it's resolved upstream. # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783 -RUN dnf reinstall -y shadow-utils && dnf clean all +RUN rpm --restore shadow-utils RUN dnf install -y mupdf && dnf clean all """ @@ -120,7 +120,7 @@ RUN dnf install -y mupdf && dnf clean all # FIXME: Drop this fix after it's resolved upstream. # See https://github.com/freedomofpress/dangerzone/issues/286#issuecomment-1347149783 -RUN dnf reinstall -y shadow-utils && dnf clean all +RUN rpm --restore shadow-utils """ # The Dockerfile for building an environment with Dangerzone installed in it. Parts of