projects
/
openwrt
/
staging
/
blocktrron.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
884bef5
)
base-files: Ignore exit code of uci.sh inclusion
author
Paul Spooren
<mail@aparcar.org>
Fri, 7 Jun 2024 14:26:14 +0000
(16:26 +0200)
committer
Paul Spooren
<mail@aparcar.org>
Fri, 7 Jun 2024 19:49:09 +0000
(21:49 +0200)
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 <mail@aparcar.org>
package/base-files/files/lib/functions.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/functions.sh
b/package/base-files/files/lib/functions.sh
index a009aa81e99d0bcdced53a51c0267b0f3873b140..0fc8c07d1ae860e3499b3a4b981507a73c11405f 100644
(file)
--- 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