frappyman: fix missing addonsticks set
This commit is contained in:
parent
ac2ff53cb3
commit
5b7a151222
@ -244,16 +244,17 @@ class FrappyManager(ServiceManager):
|
|||||||
return cfg if cfg in allcfg else cfg + '?'
|
return cfg if cfg in allcfg else cfg + '?'
|
||||||
|
|
||||||
allmain = self.all_cfg(ins, 'main')
|
allmain = self.all_cfg(ins, 'main')
|
||||||
allsticks = self.all_cfg(ins, 'stick')
|
|
||||||
if cfgs[0]:
|
if cfgs[0]:
|
||||||
result['main'] = check_cfg_file(cfgs[0], allmain)
|
result['main'] = check_cfg_file(cfgs[0], allmain)
|
||||||
if len(cfgs) > 1:
|
if len(cfgs) > 1:
|
||||||
stick = cfgs[1]
|
stick = cfgs[1]
|
||||||
|
allsticks = self.all_cfg(ins, 'stick')
|
||||||
if stick:
|
if stick:
|
||||||
if stick not in allsticks and stick in allmain:
|
if stick not in allsticks and stick in allmain:
|
||||||
stick += 'stick'
|
stick += 'stick'
|
||||||
result['stick'] = check_cfg_file(stick, allsticks)
|
result['stick'] = check_cfg_file(stick, allsticks)
|
||||||
addons = [check_cfg_file(a) for a in cfgs[2:]]
|
alladdons = self.all_cfg(ins, 'addons')
|
||||||
|
addons = [check_cfg_file(a, alladdons) for a in cfgs[2:]]
|
||||||
if addons:
|
if addons:
|
||||||
result['addons'] = ','.join(addons)
|
result['addons'] = ','.join(addons)
|
||||||
result['confirmed'] = confirmed
|
result['confirmed'] = confirmed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user