Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wraps: Ignore whitespace when applying diff_file 

Fixes https://github.com/mesonbuild/meson/issues/12092
This commit is contained in:
Nirbheek Chauhan 2023-10-30 22:02:54 +05:30 committed by Nirbheek Chauhan
parent 348c2e93d2
commit 09c0803077
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/wrap/wrap.py
View File

@ -811,13 +811,15 @@ class Resolver:
relpath = os.path.relpath(str(path), self.dirname)
if PATCH:
# Always pass a POSIX path to patch, because on Windows it's MSYS
cmd = [PATCH, '-f', '-p1', '-i', str(Path(relpath).as_posix())]
# Ignore whitespace when applying patches to workaround
# line-ending differences
cmd = [PATCH, '-l', '-f', '-p1', '-i', str(Path(relpath).as_posix())]
elif GIT:
# If the `patch` command is not available, fall back to `git
# apply`. The `--work-tree` is necessary in case we're inside a
# Git repository: by default, Git will try to apply the patch to
# the repository root.
cmd = [GIT, '--work-tree', '.', 'apply', '-p1', relpath]
cmd = [GIT, '--work-tree', '.', 'apply', '--ignore-whitespace', '-p1', relpath]
else:
raise WrapException('Missing "patch" or "git" commands to apply diff files')