TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #669 from truenas/NAS-129983-vladimir

Browse Source 
NAS-129983 / 24.10 / Do not crash if non-UTF-8 filenames are present in the upgraded BE
This commit is contained in:
themylogin
2024-07-24 13:14:45 +02:00
committed by GitHub
parent 92c842e46f aa3c448833
commit df7d2430d3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
truenas_install/__main__.py
View File

@@ -373,12 +373,13 @@ def main():
pass
exclude_list = []
for walk_root, dirs, files in os.walk(root):
root_as_bytes = root.encode()
for walk_root, dirs, files in os.walk(root_as_bytes):
for file in files:
exclude_list.append(os.path.relpath(os.path.join(walk_root, file), root))
exclude_list.append(os.path.relpath(os.path.join(walk_root, file), root_as_bytes))
with tempfile.NamedTemporaryFile() as exclude_list_file:
exclude_list_file.write("\n".join(exclude_list).encode("utf-8"))
exclude_list_file.write(b"\n".join(exclude_list))
exclude_list_file.flush()
cmd = [