projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trunk: prepare LuCI to handle .lua.gz files
[project/luci.git]
/
libs
/
cbi
/
luasrc
/
cbi.lua
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
ebca729
..
18d84e5
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-59,12
+59,15
@@
function load(cbimap, ...)
local upldir = "/lib/uci/upload/"
local cbidir = luci.util.libpath() .. "/model/cbi/"
local upldir = "/lib/uci/upload/"
local cbidir = luci.util.libpath() .. "/model/cbi/"
- assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"),
- "Model not found!")
+ assert(luci.fs.stat(cbimap) or
+ luci.fs.stat(cbidir..cbimap..".lua") or
+ luci.fs.stat(cbidir..cbimap..".lua.gz"),
+ "Model not found!")
local func, err = loadfile(cbimap)
if not func then
local func, err = loadfile(cbimap)
if not func then
- func, err = loadfile(cbidir..cbimap..".lua")
+ func, err = loadfile(cbidir..cbimap..".lua") or
+ loadfile(cbidir..cbimap..".lua.gz")
end
assert(func, err)
end
assert(func, err)