summaryrefslogtreecommitdiffhomepage
path: root/libs
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-07-19 00:38:52 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-07-19 00:38:52 +0000
commit074b5dfc4ab98edaaec7133fa03f505686c9f357 (patch)
tree3d58d5748c3cd4b71769601419beffb27d4e6d2d /libs
parent8fcd841aa9af96c8a4a4d3c1a555d2d1ed42332c (diff)
fix fallout from nixio.fs transition
Diffstat (limited to 'libs')
-rw-r--r--libs/uvl/luasrc/uvl.lua7
-rw-r--r--libs/web/luasrc/template.lua2
2 files changed, 4 insertions, 5 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