Skip to content

Commit 5637479

Browse files
committed
Merge bitcoin/bitcoin#33580: depends: Use $(package)_file_name when downloading from the fallback
671b774 depends: Use $(package)_file_name when downloading from the fallback (Ava Chow) Pull request description: The server hosting the fallbacks uses `make download` so the files are only available with their overridden names rather than the original name on the upstream source. We should therefore also use the overridden name when downloading from the fallback. Fixes bitcoin-core/bitcoincore.org#1168 ACKs for top commit: theuni: utACK 671b774. I was going to PR the same change. janb84: ut ACK 671b774 hebasto: ACK 671b774, tested with the following patch: Tree-SHA512: ba010adb64900d8d748487cc1a658e2b163872354f4e7b38c4dfc37a14fcb22fec4379a635d2c6788c64dd46bef0d94aa3eb6f522ec700680e886d5468678031
2 parents d298710 + 671b774 commit 5637479

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/funcs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ endef
3737

3838
define fetch_file
3939
( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
40-
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
40+
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(4),$(4),$(5)))
4141
endef
4242

4343
# Shell script to create a source tarball in $(1)_source from local directory

0 commit comments

Comments
 (0)