diff options
| -rw-r--r-- | libs/uvl/luasrc/uvl.lua | 7 | ||||
| -rw-r--r-- | libs/web/luasrc/template.lua | 2 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_status/routes.htm | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua index 33f45bf89..7f149cf75 100644 --- a/libs/uvl/luasrc/uvl.lua +++ b/libs/uvl/luasrc/uvl.lua @@ -19,11 +19,10 @@ $Id$ -- @class module -- @cstyle instance -require "nixio.util" - local fs = require "nixio.fs" local uci = require "luci.model.uci" local util = require "luci.util" +local nutil = require "nixio.util" local table = require "table" local string = require "string" @@ -405,11 +404,11 @@ function UVL.read_scheme( self, shm, alias ) local bc = "%s/bytecode/%s.lua" %{ self.schemedir, shm } if not fs.access(bc) then - local files = nixio.util.consume(fs.glob(self.schemedir .. '/*/' .. shm)) + local files = nutil.consume((fs.glob(self.schemedir .. '/*/' .. shm))) if #files > 0 then local ok, err - for file in files do + for _, file in ipairs(files) do if not fs.access(file) then return false, so:error(ERR.SME_READ(so,file)) end diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua index e8f65e3be..4971033a2 100644 --- a/libs/web/luasrc/template.lua +++ b/libs/web/luasrc/template.lua @@ -176,7 +176,7 @@ function Template.__init__(self, name) local tplmt = fs.stat(sourcefile, "mtime") or fs.stat(sourcefile .. ".htm", "mtime") local commt = fs.stat(compiledfile, "mtime") - if not fs.mtime(cdir) then + if not fs.stat(cdir, "mtime") then fs.mkdirr(cdir) fs.chmod(fs.dirname(cdir), 777) end diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm index 0b37abbdd..cd62b80e5 100644 --- a/modules/admin-full/luasrc/view/admin_status/routes.htm +++ b/modules/admin-full/luasrc/view/admin_status/routes.htm @@ -54,7 +54,7 @@ $Id$ </fieldset> <br /> - <% if fs.access("/proc/net/ipv6_route") then style = true %> + <% if nixio.fs.access("/proc/net/ipv6_route") then style = true %> <fieldset class="cbi-section" id="cbi-table-table"> <legend><%:a_n_routes_kernel6%></legend> |