From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 20 Dec 2011 19:02:14 +0000 (+0000)
Subject: libs/core: rework luci.model.uci.apply() to return the commandline as table, suitable... 
X-Git-Tag: 0.11.0~1203
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=574eff4e8e943967e5c72f51dc6e2216cad7d755

libs/core: rework luci.model.uci.apply() to return the commandline as table, suitable for passing to nixio.exec()
---

diff --git a/libs/core/luasrc/model/uci.lua b/libs/core/luasrc/model/uci.lua
index e42856bd5..a39456304 100644
--- a/libs/core/luasrc/model/uci.lua
+++ b/libs/core/luasrc/model/uci.lua
@@ -32,7 +32,7 @@ local table = require "table"
 local setmetatable, rawget, rawset = setmetatable, rawget, rawset
 local require, getmetatable = require, getmetatable
 local error, pairs, ipairs = error, pairs, ipairs
-local type, tostring, tonumber = type, tostring, tonumber
+local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack
 
 --- LuCI UCI model library.
 -- The typical workflow for UCI is:  Get a cursor instance from the
@@ -69,9 +69,12 @@ local Cursor = getmetatable(inst)
 -- @param command			Don't apply only return the command
 function Cursor.apply(self, configlist, command)
 	configlist = self:_affected(configlist)
-	local reloadcmd = "/sbin/luci-reload " .. table.concat(configlist, " ")
-
-	return command and reloadcmd or os.execute(reloadcmd .. " >/dev/null 2>&1")
+	if command then
+		return { "/sbin/luci-reload", unpack(configlist) }
+	else
+		return os.execute("/sbin/luci-reload %s >/dev/null 2>&1"
+			% table.concat(configlist, " "))
+	end
 end