From 17d8c5825e6f5c5d2e4d2c320c3b4b797f4ca0e9 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 7 Jun 2024 16:26:14 +0200 Subject: [PATCH] base-files: Ignore exit code of uci.sh inclusion When running unit tests this causes trouble since `/lib/config/uci.sh` isn't available in those cases. Instead exit with a clean status fo the unit test framework don't wrongly interpret things as an error. Signed-off-by: Paul Spooren --- package/base-files/files/lib/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index a009aa81e9..0fc8c07d1a 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -533,4 +533,4 @@ cmdline_get_var() { done } -[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh +[ -z "$IPKG_INSTROOT" ] && ( [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh ) || true -- 2.30.2