mirror of
https://github.com/elem74/fabaccess-config-generator.git
synced 2025-03-12 23:01:57 +01:00
bugfix dhall-syntax
This commit is contained in:
parent
fe2c114c5f
commit
debc6856ca
@ -523,9 +523,10 @@ def generate_bffh_machines(machines):
|
|||||||
data.append('{')
|
data.append('{')
|
||||||
|
|
||||||
# Inhalt
|
# Inhalt
|
||||||
last = len(machines) - 1
|
last_machine = len(machines) - 1
|
||||||
|
|
||||||
|
for index_machine, (id, m) in enumerate(machines.items()):
|
||||||
|
|
||||||
for index, (id, m) in enumerate(machines.items()):
|
|
||||||
specs = m.get_machine()
|
specs = m.get_machine()
|
||||||
data.append(space * 1 + extraspace + f'{specs["fa_id"]}' + ' =')
|
data.append(space * 1 + extraspace + f'{specs["fa_id"]}' + ' =')
|
||||||
data.append(space * 1 + extraspace + '{')
|
data.append(space * 1 + extraspace + '{')
|
||||||
@ -536,23 +537,24 @@ def generate_bffh_machines(machines):
|
|||||||
|
|
||||||
|
|
||||||
permcount = len(specs["perms"])
|
permcount = len(specs["perms"])
|
||||||
last = permcount - 1
|
last_perm = permcount - 1
|
||||||
|
|
||||||
for i in range(permcount):
|
for i in range(permcount):
|
||||||
|
|
||||||
if i < last:
|
if i < last_perm:
|
||||||
data.append(space * 2 + extraspace + f'{specs["perms_names"][i]} = "{specs["perms"][i]}",')
|
data.append(space * 2 + extraspace + f'{specs["perms_names"][i]} = "{specs["perms"][i]}",')
|
||||||
else:
|
else:
|
||||||
data.append(space * 2 + extraspace + f'{specs["perms_names"][i]} = "{specs["perms"][i]}"')
|
data.append(space * 2 + extraspace + f'{specs["perms_names"][i]} = "{specs["perms"][i]}"')
|
||||||
|
|
||||||
|
if index_machine == last_machine:
|
||||||
index +=1
|
|
||||||
|
|
||||||
if index == last:
|
|
||||||
data.append(space * 1 + extraspace + '}')
|
data.append(space * 1 + extraspace + '}')
|
||||||
|
state = 'last'
|
||||||
else:
|
else:
|
||||||
data.append(space * 1 + extraspace + '},')
|
data.append(space * 1 + extraspace + '},')
|
||||||
|
state = 'not last'
|
||||||
|
|
||||||
data.append(' ')
|
data.append(' ')
|
||||||
|
index_machine +=1
|
||||||
|
|
||||||
# Ende Datenstruktur
|
# Ende Datenstruktur
|
||||||
if settings["fa_dhall_create"] == False:
|
if settings["fa_dhall_create"] == False:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user