patchupdate.py: Ensure patch commandline utility never assumes reversed patches.

This commit is contained in:
Sebastian Lackner 2014-08-08 00:00:32 +02:00
parent ea59363fcb
commit 368f765134

View File

@ -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]