Skip to content

Commit

Permalink
Adjust install script for DNF5 once more
Browse files Browse the repository at this point in the history
--allowerasing is supported, but it must be placed after the action
"install". Since old dnf doesn't care, move the option in any case.

QubesOS/qubes-issues#9244
  • Loading branch information
marmarek committed Aug 15, 2024
1 parent c84e093 commit 837b36c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions scripts/gitlab-installv2
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@ def main(release: str, qubes_distribution: QubesDistribution, repository: Path):
repofile = "qubes-dom0.repo"
run_cmd = (
f"sed -i -e 's/4\\.2/{release}/g ' /etc/yum.repos.d/{repofile} && "
"dnf -y update && dnf -y --allowerasing install"
"dnf -y update && dnf -y install --allowerasing"
)
# dnf5 doesn't support --allowerasing (yet?)
if int(qubes_distribution.version) >= 41:
run_cmd = run_cmd.replace(" --allowerasing", "")
elif qubes_distribution.fullname in ("debian", "ubuntu"):
pkgext = "deb"
run_cmd = (
Expand Down

0 comments on commit 837b36c

Please sign in to comment.