diff options
author | Zuul <zuul@review.opendev.org> | 2022-10-25 23:34:43 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2022-10-25 23:34:43 +0000 |
commit | 57d203ae179fab51da7868532ff35eebb2c37f59 (patch) | |
tree | 3bdcd30d5188cc417261d5d26fbd5592d8592599 | |
parent | e320cb5af0f7869799be1f2c0b36f46421f71f3c (diff) | |
parent | b747d2820a6f3c9f6a1c78738c52fab49b316d26 (diff) | |
download | ironic-python-agent-57d203ae179fab51da7868532ff35eebb2c37f59.tar.gz |
Merge "Use utf-16-le if BOM not present" into stable/xena8.2.2
-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 3a37cde8..d9141002 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -289,8 +289,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. |