projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-base: break circular luci.config <> luci.model.uci dependency
[project/luci.git]
/
modules
/
luci-base
/
luasrc
/
model
/
uci.lua
diff --git
a/modules/luci-base/luasrc/model/uci.lua
b/modules/luci-base/luasrc/model/uci.lua
index
34323f0
..
461ba9d
100644
(file)
--- a/
modules/luci-base/luasrc/model/uci.lua
+++ b/
modules/luci-base/luasrc/model/uci.lua
@@
-3,7
+3,6
@@
local os = require "os"
local util = require "luci.util"
local os = require "os"
local util = require "luci.util"
-local conf = require "luci.config"
local table = require "table"
local table = require "table"
@@
-148,7
+147,8
@@
function apply(self, rollback)
local _, err
if rollback then
local _, err
if rollback then
- local timeout = tonumber(conf.apply and conf.apply.rollback or "") or 0
+ local conf = require "luci.config"
+ local timeout = tonumber(conf and conf.apply and conf.apply.rollback or "") or 0
_, err = call("apply", {
timeout = (timeout > 30) and timeout or 30,
_, err = call("apply", {
timeout = (timeout > 30) and timeout or 30,