morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-15 00:44:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove newlines from added file lines

Browse Source 
New files created by a patch were being read in with newline characters
causing any patches that then change the new file to fail validation.
This commit is contained in:
Blaise
2020-10-30 09:59:42 -05:00
parent 1f7cdef6df
commit 9612a45449
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devutils/validate_patches.py
View File

@@ -525,7 +525,7 @@ def _apply_file_unidiff(patched_file, files_under_test):
assert len(patched_file) == 1 # Should be only one hunk
assert patched_file[0].removed == 0
assert patched_file[0].target_start == 1
files_under_test[patched_file_path] = [x.value for x in patched_file[0]]
files_under_test[patched_file_path] = [x.value.rstrip('\n') for x in patched_file[0]]
elif patched_file.is_removed_file:
# Remove lines to see if file to be removed matches patch
_modify_file_lines(patched_file, files_under_test[patched_file_path])