Rebase against 64d9f309b7f74d4154e685c5d1d78c1b8335c0bc.

This commit is contained in:
Zebediah Figura
2018-09-14 21:10:12 -05:00
parent 5d3992d777
commit 1ee9d7c6e8
4 changed files with 2 additions and 71 deletions

View File

@ -398,7 +398,7 @@ def apply_patch(original, patchfile, reverse=False, fuzz=2):
shutil.copyfileobj(fp, result)
result.close()
cmdline = ["patch", "--no-backup-if-mismatch", "--force", "-r", "-"]
cmdline = ["patch", "--no-backup-if-mismatch", "--force", "--silent", "-r", "-"]
if reverse: cmdline.append("--reverse")
if fuzz != 2: cmdline.append("--fuzz=%d" % fuzz)
cmdline += [result.name, patchfile.name]