projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79231d6
)
libs/core: rework luci.model.uci.apply() to return the commandline as table, suitable...
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 20 Dec 2011 19:02:14 +0000
(19:02 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 20 Dec 2011 19:02:14 +0000
(19:02 +0000)
libs/core/luasrc/model/uci.lua
patch
|
blob
|
history
diff --git
a/libs/core/luasrc/model/uci.lua
b/libs/core/luasrc/model/uci.lua
index
e42856b
..
a394563
100644
(file)
--- 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 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
--- 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)
-- @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
end