Author: blogic Date: 2014-06-30 11:57:29 +0200 (Mon, 30 Jun 2014) New Revision: 41414
Modified: trunk/package/system/procd/Makefile trunk/package/system/procd/files/procd.sh Log: 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]> Modified: trunk/package/system/procd/Makefile =================================================================== --- trunk/package/system/procd/Makefile 2014-06-30 09:57:25 UTC (rev 41413) +++ trunk/package/system/procd/Makefile 2014-06-30 09:57:29 UTC (rev 41414) @@ -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) Modified: trunk/package/system/procd/files/procd.sh =================================================================== --- trunk/package/system/procd/files/procd.sh 2014-06-30 09:57:25 UTC (rev 41413) +++ trunk/package/system/procd/files/procd.sh 2014-06-30 09:57:29 UTC (rev 41414) @@ -269,9 +269,10 @@ 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` _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
