From c86404e5a19e7eae5f654717598d5e9ea0c9d2ae Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 9 Feb 2008 18:08:05 +0000 Subject: [PATCH] don't fail on uci_load() with nonexisting config files, but return the right return code SVN-Revision: 10433 --- package/uci/files/uci/lib/config/uci.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/uci/files/uci/lib/config/uci.sh b/package/uci/files/uci/lib/config/uci.sh index 9428a349dcc..f9a91df063b 100644 --- a/package/uci/files/uci/lib/config/uci.sh +++ b/package/uci/files/uci/lib/config/uci.sh @@ -19,15 +19,21 @@ uci_load() { local PACKAGE="$1" + local DATA + local RET _C=0 export ${NO_EXPORT:+-n} CONFIG_SECTIONS= export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0 export ${NO_EXPORT:+-n} CONFIG_SECTION= - eval "$(/sbin/uci ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE")" + DATA="$(/sbin/uci ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)" + RET="$?" + [ "$RET" != 0 -o -z "$DATA" ] || eval "$DATA" + unset DATA ${CONFIG_SECTION:+config_cb} + return "$RET" } uci_set_default() { -- 2.30.2