wraps: Ignore whitespace when applying diff_file

Fixes https://github.com/mesonbuild/meson/issues/12092
pull/12830/head
Nirbheek Chauhan 1 year ago committed by Nirbheek Chauhan
parent 348c2e93d2
commit 09c0803077
  1. 6
      mesonbuild/wrap/wrap.py

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

Loading…
Cancel
Save