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

libs/cbi: try to load fully qualified model path first, drop support for .lua.gz models

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-04-21 19:41:46 +00:00
parent b748a908b8
commit 3cb299dc10
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,12 +62,10 @@ function load(cbimap, ...)
local cbidir = luci.util.libpath() .. "/model/cbi/" local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err local func, err
if fs.access(cbimap) then if fs.access(cbidir..cbimap..".lua") then
func, err = loadfile(cbimap)
elseif fs.access(cbidir..cbimap..".lua") then
func, err = loadfile(cbidir..cbimap..".lua") func, err = loadfile(cbidir..cbimap..".lua")
elseif fs.access(cbidir..cbimap..".lua.gz") then elseif fs.access(cbimap) then
func, err = loadfile(cbidir..cbimap..".lua.gz") func, err = loadfile(cbimap)
else else
func, err = nil, "Model '" .. cbimap .. "' not found!" func, err = nil, "Model '" .. cbimap .. "' not found!"
end end