From 28e66e552f20a37a397d18b99603674446bc464f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 10 Sep 2018 19:32:35 -0500 Subject: [PATCH] patchutils: Be less silent about patches that don't apply. --- staging/patchutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/patchutils.py b/staging/patchutils.py index d7d7e299..cb40cd53 100644 --- a/staging/patchutils.py +++ b/staging/patchutils.py @@ -398,12 +398,12 @@ def apply_patch(original, patchfile, reverse=False, fuzz=2): shutil.copyfileobj(fp, result) result.close() - cmdline = ["patch", "--no-backup-if-mismatch", "--force", "--silent", "-r", "-"] + cmdline = ["patch", "--no-backup-if-mismatch", "--force", "-r", "-"] if reverse: cmdline.append("--reverse") if fuzz != 2: cmdline.append("--fuzz=%d" % fuzz) cmdline += [result.name, patchfile.name] - exitcode = subprocess.call(cmdline, stdout=_devnull, stderr=_devnull) + exitcode = subprocess.call(cmdline) if exitcode != 0: raise PatchApplyError("Failed to apply patch (exitcode %d)." % exitcode)