Makefile.fetch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b35405bce75d75e14fa376c80f26e1332b70fe9
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Apr 26 08:42:49 2024 +0200
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Apr 26 10:46:04 2024 +0200

    Fail early when external tarball can't be fetched
    
    ...so that the error output is
    
    > fetching libabw-noexist-test.tar.xz
    >   % Total    % Received % Xferd  Average Speed   Time    Time     Time  
Current
    >                                  Dload  Upload   Total   Spent    Left  
Speed
    >   0   153    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--  
   0
    > curl: (22) The requested URL returned error: 404
    
    rather than a somewhat misleading
    
    > fetching libabw-noexist-test.tar.xz
    >   % Total    % Received % Xferd  Average Speed   Time    Time     Time  
Current
    >                                  Dload  Upload   Total   Spent    Left  
Speed
    > 100   153  100   153    0     0   2463      0 --:--:-- --:--:-- --:--:--  
2467
    > ERROR: expected checksum for libabw-noexist-test.tar.xz is 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
    
    (see the mailing list sub-thread starting at
    <https://lists.freedesktop.org/archives/libreoffice/2024-April/091882.html> 
"Re:
    Uploading external tarballs to <https://dev-www.libreoffice.org/src>?")
    
    Change-Id: I91b7f37601eb69b950024ed3e1b6924ddd039379
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166692
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/Makefile.fetch b/Makefile.fetch
index afb7d176e79e..ed019e800954 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -16,7 +16,7 @@ endef
 
 else
 define fetch_Download__wget_command
-&& echo fetching $2 && bash -c '$(CURL) -L -O $1/$2 2>&1 | tee -a 
$(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
+&& echo fetching $2 && bash -c '$(CURL) -f -L -O $1/$2 2>&1 | tee -a 
$(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
 endef
 
 endif

Reply via email to