Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #698 from cshore/pull-request-fix-lib-depends

Browse source 
luci-base: utils: Make checklib return a boolean
This commit is contained in:
Hannu Nyman 2016-04-08 09:24:38 +03:00
commit cae7d7a301
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-base/luasrc/util.lua
View file

@ -640,18 +640,18 @@ function checklib(fullpathexe, wantedlib)
local fs = require "nixio.fs" local fs = require "nixio.fs"
local haveldd = fs.access('/usr/bin/ldd') local haveldd = fs.access('/usr/bin/ldd')
if not haveldd then if not haveldd then
return -1 return false
end end
local libs = exec("/usr/bin/ldd " .. fullpathexe) local libs = exec("/usr/bin/ldd " .. fullpathexe)
if not libs then if not libs then
return 0 return false
end end
for k, v in ipairs(split(libs)) do for k, v in ipairs(split(libs)) do
if v:find(wantedlib) then if v:find(wantedlib) then
return 1 return true
end end
end end
return 0 return false
end end
-- --