From 5aa285b437d14c809649beaa2b47341b0de4a67d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 26 May 2022 20:56:12 +0200 Subject: [PATCH] kernel-install: if a plugin fails, return error immediately MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since the first version in 81516adcb71a47837544340f72eb8ee810274119, kernel-install would "gather" a return value by summing the exit codes of the plugins… This makes no sense, because those are not additive values. Let's just break off immediately. We now implement cleanup via trap, so if we break, we should leave no garbage behind. --- src/kernel-install/kernel-install.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index 5f88ac2490..9296bfcd8e 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -336,7 +336,7 @@ case "$COMMAND" in err=$? [ $err -eq $skip_remaining ] && break - ret=$(( ret + err )) + [ $err -ne 0 ] && exit $err done ;; @@ -346,7 +346,7 @@ case "$COMMAND" in "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" err=$? [ $err -eq $skip_remaining ] && break - ret=$(( ret + err )) + [ $err -ne 0 ] && exit $err done if [ "$MAKE_ENTRY_DIR_ABS" -eq 0 ]; then -- 2.25.1