mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
patchupdate.py: Ensure patch commandline utility never assumes reversed patches.
This commit is contained in:
parent
ea59363fcb
commit
368f765134
2
debian/tools/patchutils.py
vendored
2
debian/tools/patchutils.py
vendored
@ -300,7 +300,7 @@ def apply_patch(content, patches, reverse=False, fuzz=2):
|
||||
for patch in patches:
|
||||
|
||||
patchfile = patch.extract()
|
||||
cmdline = ["patch", "--batch", "--silent", "-r", "-"]
|
||||
cmdline = ["patch", "--force", "--silent", "-r", "-"]
|
||||
if reverse: cmdline.append("--reverse")
|
||||
if fuzz != 2: cmdline.append("--fuzz=%d" % fuzz)
|
||||
cmdline += [contentfile.name, patchfile.name]
|
||||
|
Loading…
Reference in New Issue
Block a user