From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 21 Apr 2010 19:41:46 +0000 (+0000)
Subject: libs/cbi: try to load fully qualified model path first, drop support for .lua.gz... 
X-Git-Tag: 0.10.0~698
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=3cb299dc1077b7edee16e48255073603a3c694d8

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

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 6eeef0f78..e687164c2 100644
--- 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