From c02c8b8c25dbd2579559304ef9bebee4f9711d55 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 12 Oct 2023 22:24:45 -0500 Subject: [PATCH] patchinstall.py: Force applying with --whitespace=warn. --- staging/patchinstall.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/patchinstall.py b/staging/patchinstall.py index fea10b79..db2ce79e 100755 --- a/staging/patchinstall.py +++ b/staging/patchinstall.py @@ -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