projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37ac71b
)
libs/sys: protect iwinfo loading and return stub if module is not present
author
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 27 Nov 2010 16:57:39 +0000
(16:57 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 27 Nov 2010 16:57:39 +0000
(16:57 +0000)
libs/sys/luasrc/sys.lua
patch
|
blob
|
history
diff --git
a/libs/sys/luasrc/sys.lua
b/libs/sys/luasrc/sys.lua
index
d1137b7
..
61da6f1
100644
(file)
--- a/
libs/sys/luasrc/sys.lua
+++ b/
libs/sys/luasrc/sys.lua
@@
-624,7
+624,7
@@
wifi = {}
-- @param ifname String containing the interface name
-- @return A wrapped iwinfo object instance
function wifi.getiwinfo(ifname)
-- @param ifname String containing the interface name
-- @return A wrapped iwinfo object instance
function wifi.getiwinfo(ifname)
- local
iwinfo = require "iwinfo"
+ local
stat, iwinfo = pcall(require, "iwinfo")
if ifname then
local c = 0
if ifname then
local c = 0
@@
-652,19
+652,17
@@
function wifi.getiwinfo(ifname)
end)
end
end)
end
- local t = iwinfo.type(ifname)
- if t then
- local x = iwinfo[t]
- return setmetatable({}, {
- __index = function(t, k)
- if k == "ifname" then
- return ifname
- elseif x[k] then
- return x[k](ifname)
- end
+ local t = stat and iwinfo.type(ifname)
+ local x = t and iwinfo[t] or { }
+ return setmetatable({}, {
+ __index = function(t, k)
+ if k == "ifname" then
+ return ifname
+ elseif x[k] then
+ return x[k](ifname)
end
end
- })
- end
+ end
+ })
end
end
end
end