From 4a3a53a168668bf3420d874e3cc6bd9b425e64b9 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 26 Nov 2024 22:33:32 +0100 Subject: [PATCH] Fix deprecated flag for dnf5 Previously it was attempted to replace `-d` flag, while in fact the one which was deprecated was `-v`. This follow-up fixes behaviour for building images prior to Fedora 41. --- yum/bin/install-packages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yum/bin/install-packages b/yum/bin/install-packages index 8d7dc15..599e234 100755 --- a/yum/bin/install-packages +++ b/yum/bin/install-packages @@ -26,7 +26,7 @@ MAP_ELEMENT= # allow override for dnf, as shipped by default with >=F22 YUM=${YUM:-yum} -YUM_FLAGS=${YUM_FLAGS:--y -d} +YUM_FLAGS=${YUM_FLAGS:--y -v} # save global xtrace state _xtrace=$(set +o | grep xtrace) @@ -136,10 +136,10 @@ if [ -n "$WHITELIST" ]; then # [1] https://bugzilla.redhat.com/show_bug.cgi?id=965567 set -o xtrace - DNF5=$(which dnf5 2>/dev/null) + DNF5=$(which dnf5 2>/dev/null || true) if [ ${YUM} == 'dnf' ] && [ -n "$DNF5" ]; then # dnf5 does not support debug flag - YUM_FLAGS=${YUM_FLAGS//-d} + YUM_FLAGS=${YUM_FLAGS//-v} fi ${YUM} $YUM_FLAGS $ACTION $EXTRA_ARGS $PKGS