diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-18 01:34:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-18 01:34:35 +0000 |
| commit | b41c557dbfa19735e1213373174617dadc519889 (patch) | |
| tree | af7073947c3d74f8e6f530f11da818a7df758281 | |
| parent | 5c571414b9c176f7ee28e561ed99ee93248496a8 (diff) | |
| parent | 0f0ac47bae85d09d231eb9ac2999f50d8aae1e38 (diff) | |
| download | ironic-python-agent-b41c557dbfa19735e1213373174617dadc519889.tar.gz | |
Merge "Use utf-16-le if BOM not present" into stable/wallabywallaby-em7.1.0
| -rw-r--r-- | ironic_python_agent/extensions/image.py | 10 | ||||
| -rw-r--r-- | releasenotes/notes/detect-endianness-f53a6c4571aba3fe.yaml | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py index f5a0142d..3ea3b802 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -286,8 +286,14 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition, 'File: %s', v_bl) # These files are always UTF-16 encoded, sometimes have a header. # Positive bonus is python silently drops the FEFF header. - with open(mount_point + '/' + v_bl, 'r', encoding='utf-16') as csv: - contents = str(csv.read()) + try: + with open(mount_point + '/' + v_bl, 'r', + encoding='utf-16') as csv: + contents = str(csv.read()) + except UnicodeError: + with open(mount_point + '/' + v_bl, 'r', + encoding='utf-16-le') as csv: + contents = str(csv.read()) csv_contents = contents.split(',', maxsplit=3) csv_filename = v_bl.split('/')[-1] v_efi_bl_path = v_bl.replace(csv_filename, str(csv_contents[0])) diff --git a/releasenotes/notes/detect-endianness-f53a6c4571aba3fe.yaml b/releasenotes/notes/detect-endianness-f53a6c4571aba3fe.yaml new file mode 100644 index 00000000..82d90886 --- /dev/null +++ b/releasenotes/notes/detect-endianness-f53a6c4571aba3fe.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + In case the CSV file used for the bootloader hint does not have BOM + we fail reading its content as utf-16 codec is too generic. + Fail over to utf-16-le as Little Endian is mostly used. |