Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/cbi: fix error reporting in map loading

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-07-31 00:13:24 +00:00
parent 45d9fe0b16
commit f311d13ca1
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/cbi/luasrc/cbi.lua
View file

@ -60,17 +60,18 @@ function load(cbimap, ...)
local upldir = "/lib/uci/upload/" local upldir = "/lib/uci/upload/"
local cbidir = luci.util.libpath() .. "/model/cbi/" local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err
assert(fs.stat(cbimap) or if fs.access(cbimap) then
fs.stat(cbidir..cbimap..".lua") or func, err = loadfile(cbimap)
fs.stat(cbidir..cbimap..".lua.gz"), elseif fs.access(cbidir..cbimap..".lua") then
"Model not found!") func, err = loadfile(cbidir..cbimap..".lua")
elseif fs.access(cbidir..cbimap..".lua.gz") then
local func, err = loadfile(cbimap) func, err = loadfile(cbidir..cbimap..".lua.gz")
if not func then else
func, err = loadfile(cbidir..cbimap..".lua") or func, err = nil, "Model '" .. cbimap .. "' not found!"
loadfile(cbidir..cbimap..".lua.gz")
end end
assert(func, err) assert(func, err)
luci.i18n.loadc("cbi") luci.i18n.loadc("cbi")