From 3982c5a04d398f3eaed93badc33f01e8008b919f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 12 Feb 2025 13:41:22 +0100 Subject: [PATCH] Revert "fedora/REQUIRED_PACKAGES: speed up optional packages installation" dnf --skip-unavailable not available on CentOS 9. This reverts commit 5409d4f5cd4088e40ee5b7077ffca7380fede731. (cherry picked from commit e2aa19a06cfb84ecb31e979bcb2a9aca0a0a5bfb) --- contrib/fedora/REQUIRED_PACKAGES | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index d47e60980a..418318d70c 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -25,6 +25,12 @@ install() { fi } +install_ignore_missing() { + for p; do + install "$p" || : + done +} + if test "$NM_NO_EXTRA" != 1; then # these packages are convenient for developing, but not necessary # for CI testing. @@ -82,9 +88,8 @@ install \ which \ #end -# Some packages don't exist in certain distributions. Ignore errors -# installing them, but still drag them in when available. -install --skip-unavailable \ +# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors. +install_ignore_missing \ black \ dbus-python \ dhclient \