Skip to content
Snippets Groups Projects
Unverified Commit 298723c2 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-core: gluon-check-site: do not fail when IPKG_INSTROOT is unset

parent eb3fad4b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
package/gluon-core/luasrc/lib/gluon/check-site.lua
+ 2
− 2
View file @ 298723c2
...@@ -360,7 +360,7 @@ end ...@@ -360,7 +360,7 @@ end
function M.need_domain_name(path) function M.need_domain_name(path)
M.need_string(path) M.need_string(path)
M.need(path, function(domain_name) M.need(path, function(domain_name)
local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. domain_name .. '.json') local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/domains/' .. domain_name .. '.json')
if not f then return false end if not f then return false end
f:close() f:close()
return true return true
...@@ -383,7 +383,7 @@ end ...@@ -383,7 +383,7 @@ end
local check = setfenv(assert(loadfile()), M) local check = setfenv(assert(loadfile()), M)
site = assert(json.load(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json')) site = assert(json.load((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/site.json'))
local ok, err = pcall(function() local ok, err = pcall(function()
if has_domains then if has_domains then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment