shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-02-22 09:57:44 +03:00
Code Issues Projects Releases Wiki Activity

tests: Port the last python2 script to python3

Browse Source 
This is not used by any test, nor is it packaged. Though let's just port
it over to py3 to certify our codebase completely py2-free. I've
manually checked that the script is still functional.

Closes: #1546
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-04-19 09:58:51 -04:00 committed by Atomic Bot
parent d56058bc9a
commit 8cfef187c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/grub2-entries-crosscheck.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# Copyright (C) 2015 Red Hat # Copyright (C) 2015 Red Hat
# #
@ -19,6 +19,7 @@
import os import os
import sys import sys
import functools
if len(sys.argv) == 1: if len(sys.argv) == 1:
loaderpath = '/boot/loader/entries' loaderpath = '/boot/loader/entries'
@ -40,7 +41,7 @@ def get_ostree_option(optionstring):
if o.startswith('ostree='): if o.startswith('ostree='):
return o[8:] return o[8:]
raise ValueError('ostree= not found') raise ValueError('ostree= not found')
entries = [] entries = []
grub2_entries = [] grub2_entries = []
@ -59,7 +60,7 @@ for fname in os.listdir(loaderpath):
v = line[s+1:] v = line[s+1:]
entry[k] = v entry[k] = v
entries.append(entry) entries.append(entry)
entries.sort(compare_entries_descending) entries.sort(key=functools.cmp_to_key(compare_entries_descending))
# Parse GRUB2 config # Parse GRUB2 config
with open(grub2path) as f: with open(grub2path) as f:
@ -68,7 +69,7 @@ with open(grub2path) as f:
for line in f: for line in f:
if line.startswith('### BEGIN /etc/grub.d/15_ostree ###'): if line.startswith('### BEGIN /etc/grub.d/15_ostree ###'):
in_ostree_config = True in_ostree_config = True
elif line.startswith('### END /etc/grub.d/15_ostree ###'): elif line.startswith('### END /etc/grub.d/15_ostree ###'):
in_ostree_config = False in_ostree_config = False
if grub2_entry is not None: if grub2_entry is not None:
grub2_entries.append(grub2_entry) grub2_entries.append(grub2_entry)