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

[project/luci.git] / libs / cbi / luasrc / cbi.lua

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 6eeef0f78757a755c89f8ea4f0d198de1e38bdad..e687164c25f1dc8e3fba9a98d89fc0dc3f8f49aa 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
 
-       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")
-       elseif fs.access(cbidir..cbimap..".lua.gz") then
-               func, err = loadfile(cbidir..cbimap..".lua.gz")
+       elseif fs.access(cbimap) then
+               func, err = loadfile(cbimap)
        else
                func, err = nil, "Model '" .. cbimap .. "' not found!"
        end