summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDaniel Dickinson <openwrt@daniel.thecshore.com>2016-03-29 10:18:22 -0400
committerDaniel Dickinson <openwrt@daniel.thecshore.com>2016-04-08 02:18:42 -0400
commit97f2937034d99642d79bf081d135e8fcd8e2bf3c (patch)
treee1ef890621ab3744dcfa64f02f5dbf13fb588c4e
parentc5c199bc00108c7488c3d68f4ee6a7ebb28c0b54 (diff)
luci-base: utils: Make checklib return a boolean
Using tristate is counter-intuitive and probably doesn't provide a lot of benefit so we use a boolean and treat "don't know" as false (because it is safer than showing options that are not actually available). Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
-rw-r--r--modules/luci-base/luasrc/util.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index d614a6c799..896e36b45f 100644
--- a/modules/luci-base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
@@ -640,18 +640,18 @@ function checklib(fullpathexe, wantedlib)
local fs = require "nixio.fs"
local haveldd = fs.access('/usr/bin/ldd')
if not haveldd then
- return -1
+ return false
end
local libs = exec("/usr/bin/ldd " .. fullpathexe)
if not libs then
- return 0
+ return false
end
for k, v in ipairs(split(libs)) do
if v:find(wantedlib) then
- return 1
+ return true
end
end
- return 0
+ return false
end
--