Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-01 02:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] When initially reverting wine-staging patches, ignore whitespace.

Browse source 
This fixes in particular problems when reverting created new files (i.e.
they are deleted). I suspect this is due to an endline-format "expectation"
from the git apply command.
This commit is contained in:
Hermès Bélusca-Maïto 2023-09-12 17:24:59 +02:00
parent 1d92196d2a
commit 32b81a9157
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sdk/tools/winesync/winesync.py
View file

@ -290,7 +290,7 @@ class wine_sync:
with open(patch_path, 'rb') as patch_file:
try:
subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--reject'], stdin=patch_file, check=True)
subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--ignore-whitespace', '--reject'], stdin=patch_file, check=True)
except subprocess.CalledProcessError as err:
print(f'Error while reverting patch {patch_file_name}')
print('Please check, remove the offending patch with git rm, and relaunch this script')