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

gluon-autoupdater: make site.conf branch setting optional

Browse Source 
Default to the alphabetically smallest branch if none is set in
site.conf.

Also prevent enabling the autoupdater when no branches exist.
This commit is contained in:
Matthias Schiffer 2020-07-04 12:12:11 +02:00
parent ee53357580
commit d82ffb4f81
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-autoupdater/check_site.lua
View File

@ -1,4 +1,4 @@
need_string(in_site({'autoupdater', 'branch'})) need_string(in_site({'autoupdater', 'branch'}), false)
need_table({'autoupdater', 'branches'}, function(branch) need_table({'autoupdater', 'branches'}, function(branch)
need_alphanumeric_key(branch) need_alphanumeric_key(branch)

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

@ -5,6 +5,8 @@ local uci = require('simple-uci').cursor()
local unistd = require 'posix.unistd' local unistd = require 'posix.unistd'
local min_branch
for name, config in pairs(site.autoupdater.branches()) do for name, config in pairs(site.autoupdater.branches()) do
uci:delete('autoupdater', name) uci:delete('autoupdater', name)
uci:section('autoupdater', 'branch', name, { uci:section('autoupdater', 'branch', name, {
@ -13,18 +15,26 @@ for name, config in pairs(site.autoupdater.branches()) do
good_signatures = config.good_signatures, good_signatures = config.good_signatures,
pubkey = config.pubkeys, pubkey = config.pubkeys,
}) })
if not min_branch or (name < min_branch) then
min_branch = name
end
end 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() local branch = site.autoupdater.branch(min_branch)
local f = io.open('/lib/gluon/autoupdater/default_branch') local f = io.open('/lib/gluon/autoupdater/default_branch')
if f then if f then
branch = f:read('*line') branch = f:read('*line')
f:close() f:close()
end end
if not branch then
enabled = false
end
uci:section('autoupdater', 'autoupdater', 'settings', { uci:section('autoupdater', 'autoupdater', 'settings', {
enabled = enabled, enabled = enabled,
branch = branch, branch = branch,