Refactor tests/bootloader-entries-crosscheck.py

Reduce duplication.
This commit is contained in:
William Manley 2020-07-15 15:57:26 +01:00
parent cb2ecd1459
commit 4deb426835
1 changed files with 14 additions and 11 deletions

View File

@ -73,21 +73,24 @@ with open(syslinuxpath) as f:
syslinux_entry = None syslinux_entry = None
syslinux_default = None syslinux_default = None
for line in f: for line in f:
line = line.strip() try:
if line.startswith('DEFAULT '): k, v = line.strip().split(" ", 1)
except ValueError:
continue
if k == 'DEFAULT':
if syslinux_entry is not None: if syslinux_entry is not None:
syslinux_default = line.split(' ', 1)[1] syslinux_default = v
elif line.startswith('LABEL '): elif k == 'LABEL':
if syslinux_entry is not None: if syslinux_entry is not None:
syslinux_entries.append(syslinux_entry) syslinux_entries.append(syslinux_entry)
syslinux_entry = {} syslinux_entry = {}
syslinux_entry['title'] = line.split(' ', 1)[1] syslinux_entry['title'] = v
elif line.startswith('KERNEL '): elif k == 'KERNEL':
syslinux_entry['linux'] = line.split(' ', 1)[1] syslinux_entry['linux'] = v
elif line.startswith('INITRD '): elif k == 'INITRD':
syslinux_entry['initrd'] = line.split(' ', 1)[1] syslinux_entry['initrd'] = v
elif line.startswith('APPEND '): elif k == 'APPEND':
syslinux_entry['options'] = line.split(' ', 1)[1] syslinux_entry['options'] = v
if syslinux_entry is not None: if syslinux_entry is not None:
syslinux_entries.append(syslinux_entry) syslinux_entries.append(syslinux_entry)