From c8e03d723ed689eb7282870d2761bc82f6559c56 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 4 Nov 2024 16:38:09 +0100 Subject: [PATCH] Remove workaround for dnf5 addrepo bug This reverts commit 27f47c592a72999298581970a9d9339c14e842ba. Signed-off-by: Sebastiaan van Stijn --- install.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 48b0d6a..22c9ba1 100755 --- a/install.sh +++ b/install.sh @@ -558,15 +558,8 @@ do_install() { set -x fi if command_exists dnf5; then - # $sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core" - # $sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'" - - $sh_c "dnf -y -q --setopt=install_weak_deps=False install curl dnf-plugins-core" - # FIXME(thaJeztah); strip empty lines as workaround for https://github.com/rpm-software-management/dnf5/issues/1603 - TMP_REPO_FILE="$(mktemp --dry-run)" - $sh_c "curl -fsSL '$repo_file_url' | tr -s '\n' > '${TMP_REPO_FILE}'" - $sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --overwrite --from-repofile='${TMP_REPO_FILE}'" - $sh_c "rm -f '${TMP_REPO_FILE}'" + $sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core" + $sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'" if [ "$CHANNEL" != "stable" ]; then $sh_c "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""