JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: patching: remove quotes from author name during parsing

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-15 17:14:02 +01:00
parent 0207d5f517
commit 7096cf70d3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tools/common/patching_utils.py
View File

@@ -277,10 +277,10 @@ class PatchInPatchFile:
self.problems.append("invalid_author") self.problems.append("invalid_author")
log.warning( log.warning(
f"Failed to parse name and email from: '{from_str}' while parsing patch {self.counter} in file {self.parent.full_file_path()}") f"Failed to parse name and email from: '{from_str}' while parsing patch {self.counter} in file {self.parent.full_file_path()}")
return downgrade_to_ascii(from_str), "unknown-email@domain.tld" return downgrade_to_ascii(remove_quotes(from_str)), "unknown-email@domain.tld"
else: else:
# Return the name and email # Return the name and email
return downgrade_to_ascii(m.group("name")), m.group("email") return downgrade_to_ascii(remove_quotes(m.group("name"))), remove_quotes(m.group("email"))
def one_line_patch_stats(self) -> str: def one_line_patch_stats(self) -> str:
files_desc = ", ".join(self.patched_file_stats_dict) files_desc = ", ".join(self.patched_file_stats_dict)
@@ -713,6 +713,10 @@ def downgrade_to_ascii(utf8: str) -> str:
return unidecode(utf8) return unidecode(utf8)
def remove_quotes(utf8: str) -> str:
return utf8.replace('"', '')
# Try hard to read a possibly invalid utf-8 file # Try hard to read a possibly invalid utf-8 file
def read_file_as_utf8(file_name: str) -> tuple[str, list[str]]: def read_file_as_utf8(file_name: str) -> tuple[str, list[str]]:
with open(file_name, "rb") as f: with open(file_name, "rb") as f: