From 63991ba875e46f40324352a5317d144465567833 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 14 Aug 2010 00:45:15 +0000
Subject: base-files, uci: properly revert list state on config_load This fixes
 a bug where lists end up with duplicate values if config_load was invoked
 multiple times.

SVN-Revision: 22629
---
 package/uci/files/lib/config/uci.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'package/uci/files/lib/config')

diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh
index d759615bd5..8dcb92b9f8 100644
--- a/package/uci/files/lib/config/uci.sh
+++ b/package/uci/files/lib/config/uci.sh
@@ -23,9 +23,15 @@ uci_load() {
 	local PACKAGE="$1"
 	local DATA
 	local RET
+	local VAR
 
 	_C=0
 	if [ -z "$CONFIG_APPEND" ]; then
+		for VAR in $CONFIG_LIST_STATE; do
+			export ${NO_EXPORT:+-n} CONFIG_${VAR}=
+			export ${NO_EXPORT:+-n} CONFIG_${VAR}_LENGTH=
+		done
+		export ${NO_EXPORT:+-n} CONFIG_LIST_STATE=
 		export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
 		export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
 		export ${NO_EXPORT:+-n} CONFIG_SECTION=
-- 
cgit v1.2.3