Makefile.fetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 1e002d8c56a3d45ff8a22006cabc3fefb54780d6 Author: Christian Lohmaier <[email protected]> Date: Wed Nov 28 22:47:58 2012 +0100 use $PIPESTATUS instead of pipefail option as pipefail is not supported in bash 2.x (used on Mac/PPC) Change-Id: Iaeaed7d759be700719fb941b13942e4933c5ee71 Reviewed-on: https://gerrit.libreoffice.org/1190 Reviewed-by: Matúš Kukan <[email protected]> Tested-by: Matúš Kukan <[email protected]> diff --git a/Makefile.fetch b/Makefile.fetch index 1babbf5..249502d 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,12 +11,12 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& $(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) +&& $(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] endef else define fetch_Download__wget_command -&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) +&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] endef endif @@ -39,7 +39,6 @@ endif define fetch__Download_item $(if $(wildcard $(TARFILE_LOCATION)/$2),, \ cd $(TARFILE_LOCATION)/tmp \ -&& set -o pipefail \ $(call fetch_Download__wget_command,$1,$2) \ $(if $3,$(call fetch_Download__checksum_command,$2,$3)) \ && mv $2 ../ \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
