openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Use utf-16-le if BOM not present"

Browse Source
This commit is contained in:
Zuul 2022-03-02 16:55:43 +00:00 committed by Gerrit Code Review
commit cf46443120
2 changed files with 14 additions and 2 deletions
ironic_python_agent
efi_utils.py
releasenotes/notes
detect-endianness-f53a6c4571aba3fe.yaml

10
ironic_python_agent/efi_utils.py

@ -297,8 +297,14 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
'File: %s', v_bl) 'File: %s', v_bl)
# These files are always UTF-16 encoded, sometimes have a header. # These files are always UTF-16 encoded, sometimes have a header.
# Positive bonus is python silently drops the FEFF header. # Positive bonus is python silently drops the FEFF header.
with open(mount_point + '/' + v_bl, 'r', encoding='utf-16') as csv: try:
contents = str(csv.read()) 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_contents = contents.split(',', maxsplit=3)
csv_filename = v_bl.split('/')[-1] csv_filename = v_bl.split('/')[-1]
v_efi_bl_path = v_bl.replace(csv_filename, str(csv_contents[0])) v_efi_bl_path = v_bl.replace(csv_filename, str(csv_contents[0]))

6
releasenotes/notes/detect-endianness-f53a6c4571aba3fe.yaml Normal file

@ -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.