Skip to content

Commit

Permalink
dev_scripts: Alter the shadow-utils fix
Browse files Browse the repository at this point in the history
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
  • Loading branch information
apyrgio committed Feb 7, 2023
1 parent d78cab8 commit 183d4ee
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions dev_scripts/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# 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 -y shadow-utils
RUN dnf install -y mupdf && dnf clean all
"""
Expand Down Expand Up @@ -120,7 +120,7 @@
# 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 -y shadow-utils
"""

# The Dockerfile for building an environment with Dangerzone installed in it. Parts of
Expand Down

0 comments on commit 183d4ee

Please sign in to comment.