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:
b748a90
)
libs/cbi: try to load fully qualified model path first, drop support for .lua.gz...
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 21 Apr 2010 19:41:46 +0000
(19:41 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 21 Apr 2010 19:41:46 +0000
(19:41 +0000)
libs/cbi/luasrc/cbi.lua
patch
|
blob
|
history
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
6eeef0f
..
e687164
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-62,12
+62,10
@@
function load(cbimap, ...)
local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err
local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err
- if fs.access(cbimap) then
- func, err = loadfile(cbimap)
- elseif fs.access(cbidir..cbimap..".lua") then
+ if fs.access(cbidir..cbimap..".lua") then
func, err = loadfile(cbidir..cbimap..".lua")
func, err = loadfile(cbidir..cbimap..".lua")
- elseif fs.access(cbi
dir..cbimap..".lua.gz"
) then
- func, err = loadfile(cbi
dir..cbimap..".lua.gz"
)
+ elseif fs.access(cbi
map
) then
+ func, err = loadfile(cbi
map
)
else
func, err = nil, "Model '" .. cbimap .. "' not found!"
end
else
func, err = nil, "Model '" .. cbimap .. "' not found!"
end