nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-autoupdater: factor out default_branch() function

Browse Source 
Make the code clearer and prepare for invalid branch fixup.
This commit is contained in:
Matthias Schiffer 2022-05-15 11:58:13 +02:00
parent db48b6b693
commit 2c65f0834b
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater
View File

@ -21,16 +21,21 @@ for name, config in pairs(site.autoupdater.branches()) do
end end
end end
local function default_branch()
local f = io.open('/lib/gluon/autoupdater/default_branch')
if f then
local ret = f:read('*line')
f:close()
return ret
end
return site.autoupdater.branch(min_branch)
end
if not uci:get('autoupdater', 'settings') then if not uci:get('autoupdater', 'settings') then
local enabled = unistd.access('/lib/gluon/autoupdater/default_enabled') ~= nil local enabled = unistd.access('/lib/gluon/autoupdater/default_enabled') ~= nil
local branch = site.autoupdater.branch(min_branch) local branch = default_branch()
local f = io.open('/lib/gluon/autoupdater/default_branch')
if f then
branch = f:read('*line')
f:close()
end
if not branch then if not branch then
enabled = false enabled = false
end end