diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-17 14:25:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-17 14:25:19 +0200 |
| commit | ffcdefe83ab043edef943657d5dedef75faaa5b0 (patch) | |
| tree | a528221e6300486d060752c4016e3ac9ce5953fc /solenv | |
| parent | fb3bec7b3dd9b00600d5b0ef9e8ee0052f7fa248 (diff) | |
gbuild: UnpackedTarball: do not query for input on "reversed" patch
This can apparently happen when interrupting a build; reproducible with
"touch workdir/*/UnpackedTarget/*openssl* && make openssl".
The -f parameter would apparently silently ignore some mal-formed
patches but at least it rejects potentially reversed ones,
which causes the "error handler" in gb_UnpackedTarball__command
to touch the "prepare" target so the next make is successful.
Change-Id: I7bbd7d9385d990a69214a3a2d9bb20b5a7173748
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index dd47a35a6d7d..2342dc9e9ee2 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -140,7 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\ for p in $(UNPACKED_PATCHES); do \ pl=$(UNPACKED_PATCHLEVEL); \ s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ - $(GNUPATCH) -s "-p$$pl" < "$$p"; \ + $(GNUPATCH) -f -s "-p$$pl" < "$$p"; \ if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\ done && \ ) \ |