wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

patchinstall.py: Force applying with --whitespace=warn.

Browse Source
This commit is contained in:
Zebediah Figura 2023-10-12 22:24:45 -05:00
parent 9150a8751e
commit c02c8b8c25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/patchinstall.py
View File

@ -77,15 +77,15 @@ def parse_def_file(name, path):
def apply_patch(patch):
if backend == 'git-am':
return run(['git','-C',winedir,'am',patch])
return run(['git','-C',winedir,'am','--whitespace=warn',patch])
elif backend == 'git-am-C1':
return run(['git','-C',winedir,'am','-C1',patch])
return run(['git','-C',winedir,'am','--whitespace=warn','-C1',patch])
elif backend == 'patch':
with open(patch) as f:
print(patchdir+'/gitapply.sh -d', winedir, '<', patch)
return subprocess.call([patchdir+'/gitapply.sh','-d',winedir],stdin=f)
elif backend == 'git-apply':
return run(['git','-C',winedir,'apply','--index',patch])
return run(['git','-C',winedir,'apply','--index','--whitespace=warn',patch])
def run_autoconf(patch):
if not force_autoconf: return