[Libreoffice-commits] core.git: Makefile.fetch

Khaled Hosny khaledhosny at eglug.org
Mon Mar 13 00:52:09 UTC 2017


 Makefile.fetch |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 48670533998f078525f7dad94b89bc371a5b3947
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Mar 11 04:09:21 2017 +0200

    Ignore the checksum embedded in the file name
    
    That is always MD5 sum, but we expect SHA256 now.
    
    Change-Id: I8edf61b9a663f6f1ecc5cf23c93211e0b3201631
    Reviewed-on: https://gerrit.libreoffice.org/35067
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/Makefile.fetch b/Makefile.fetch
index 3091c5e..de929d8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -59,10 +59,7 @@ endef
 define fetch_Download_item
 $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty))
 $(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2)))),\
-	$(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2))))),\
-		$(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2))))),\
-		$(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst.") \
-	),\
+	$(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst."),\
 	$(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2)))) \
 )
 


More information about the Libreoffice-commits mailing list