Browse Source

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 <[email protected]>

SVN-Revision: 41414
John Crispin 11 years ago
parent
commit
9912d02fa1
2 changed files with 10 additions and 2 deletions
  1. 8 1
      package/system/procd/Makefile
  2. 2 1
      package/system/procd/files/procd.sh

+ 8 - 1
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)
 

+ 2 - 1
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`