diff options
author | William Manley <will@stb-tester.com> | 2020-07-15 15:57:26 +0100 |
---|---|---|
committer | William Manley <will@stb-tester.com> | 2020-07-15 17:42:04 +0100 |
commit | 4deb426835d234eaa55046175f7dffaea7864fdb (patch) | |
tree | 1ab317b41d29723fce923f9c718161030363d495 /tests/bootloader-entries-crosscheck.py | |
parent | cb2ecd1459605335b3a48c79d03225d7a1c2cc65 (diff) | |
download | ostree-4deb426835d234eaa55046175f7dffaea7864fdb.tar.gz |
Refactor tests/bootloader-entries-crosscheck.py
Reduce duplication.
Diffstat (limited to 'tests/bootloader-entries-crosscheck.py')
-rwxr-xr-x | tests/bootloader-entries-crosscheck.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py index 41f6956e..b4cdcbf5 100755 --- a/tests/bootloader-entries-crosscheck.py +++ b/tests/bootloader-entries-crosscheck.py @@ -73,21 +73,24 @@ with open(syslinuxpath) as f: syslinux_entry = None syslinux_default = None for line in f: - line = line.strip() - if line.startswith('DEFAULT '): + try: + k, v = line.strip().split(" ", 1) + except ValueError: + continue + if k == 'DEFAULT': if syslinux_entry is not None: - syslinux_default = line.split(' ', 1)[1] - elif line.startswith('LABEL '): + syslinux_default = v + elif k == 'LABEL': if syslinux_entry is not None: syslinux_entries.append(syslinux_entry) syslinux_entry = {} - syslinux_entry['title'] = line.split(' ', 1)[1] - elif line.startswith('KERNEL '): - syslinux_entry['linux'] = line.split(' ', 1)[1] - elif line.startswith('INITRD '): - syslinux_entry['initrd'] = line.split(' ', 1)[1] - elif line.startswith('APPEND '): - syslinux_entry['options'] = line.split(' ', 1)[1] + syslinux_entry['title'] = v + elif k == 'KERNEL': + syslinux_entry['linux'] = v + elif k == 'INITRD': + syslinux_entry['initrd'] = v + elif k == 'APPEND': + syslinux_entry['options'] = v if syslinux_entry is not None: syslinux_entries.append(syslinux_entry) |