aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-30 09:57:29 +0000
committerJohn Crispin <john@openwrt.org>2014-06-30 09:57:29 +0000
commit9912d02fa1d0e0f4a484180d23c812223bde7e11 (patch)
treef8d2b85574c15da3b84027ac50880c8af58b50ae
parenta7863b1368b7cd2c6486acf3cac111905ac2cfb0 (diff)
downloadupstream-9912d02fa1d0e0f4a484180d23c812223bde7e11.tar.gz
upstream-9912d02fa1d0e0f4a484180d23c812223bde7e11.tar.bz2
upstream-9912d02fa1d0e0f4a484180d23c812223bde7e11.zip
procd: fix uci_validation
Regardles of the return code from validate_data _error variable will be 0 due to 'local' command in the previous line. With this patch we are able to catch the return code from validate_data tool. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41414
-rw-r--r--package/system/procd/Makefile9
-rw-r--r--package/system/procd/files/procd.sh3
2 files changed, 10 insertions, 2 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 6553fcc831..30bcd2a7f2 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,7 +1,14 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
-PKG_VERSION:=2014-06-19
+PKG_VERSION:=2014-06-27
PKG_RELEASE=$(PKG_SOURCE_VERSION)
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 67924a2749..c5fd512486 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -269,9 +269,10 @@ uci_validate_section()
local _package="$1"
local _type="$2"
local _name="$3"
+ local _result
local _error
shift; shift; shift
- local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
+ _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
_error=$?
eval "$_result"
[ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`