espressif/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2025-06-24 01:52:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ignore whitespace when working with patches.

Browse Source
This commit is contained in:
Yuhui Zheng
2020-03-24 15:14:24 -07:00
parent 8156f64d1c
commit 211bb4cbd9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeRTOS/Test/CBMC/patches/patch.py
View File

@ -16,7 +16,7 @@ def patch():
failed_patches = [] failed_patches = []
for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")): for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")):
print("patch", tmpfile) print("patch", tmpfile)
result = subprocess.run(["git", "apply", tmpfile], result = subprocess.run(["git", "apply", "--ignore-whitespace", tmpfile],
cwd=os.path.join("..", "..", "..")) cwd=os.path.join("..", "..", ".."))
if result.returncode: if result.returncode:
failed_patches.append(tmpfile) failed_patches.append(tmpfile)

2
FreeRTOS/Test/CBMC/patches/unpatch.py
View File

@ -36,7 +36,7 @@ except FileNotFoundError:
sys.exit(0) sys.exit(0)
for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")): for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")):
print("unpatch", tmpfile) print("unpatch", tmpfile)
result = subprocess.run(["git", "apply", "-R", tmpfile], result = subprocess.run(["git", "apply", "-R", "--ignore-whitespace", tmpfile],
cwd=os.path.join("..", "..", "..")) cwd=os.path.join("..", "..", ".."))
if result.returncode: if result.returncode:
print("Unpatching failed: {}".format(tmpfile)) print("Unpatching failed: {}".format(tmpfile))