mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
Merge bitcoin/bitcoin#30703: test: Avoid duplicate curl call in get_previous_releases.py
Some checks are pending
Some checks are pending
fa5aeab3cb
test: Avoid duplicate curl call in get_previous_releases.py (MarcoFalke) Pull request description: Seems odd having to translate `404` to "Binary tag was not found". Also, it seems odd to write a for-loop over a list with one item. Fix both issues by just using a single call to `curl --fail ...`. Can be tested with: `test/get_previous_releases.py -b v99.99.99` Before: ``` Releases directory: releases Fetching: https://bitcoincore.org/bin/bitcoin-core-99.99.99/bitcoin-99.99.99-x86_64-linux-gnu.tar.gz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 286k 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 Binary tag was not found ``` After: ``` Releases directory: releases Fetching: https://bitcoincore.org/bin/bitcoin-core-99.99.99/bitcoin-99.99.99-x86_64-linux-gnu.tar.gz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 286k 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 curl: (22) The requested URL returned error: 404 ACKs for top commit: fanquake: ACKfa5aeab3cb
brunoerg: utACKfa5aeab3cb
tdb3: tested ACKfa5aeab3cb
Tree-SHA512: d5d31e0bccdd9de9b4a8ecf2e69348f4e8cee773050c8259b61db1ce5de73f6fbfffbe8c4d2571f7bef2de29cb42fd244573deebfbec614e487e76ef41681b9c
This commit is contained in:
commit
d54fbc85c4
1 changed files with 3 additions and 14 deletions
|
@ -133,20 +133,9 @@ def download_binary(tag, args) -> int:
|
|||
|
||||
print('Fetching: {tarballUrl}'.format(tarballUrl=tarballUrl))
|
||||
|
||||
header, status = subprocess.Popen(
|
||||
['curl', '--head', tarballUrl], stdout=subprocess.PIPE).communicate()
|
||||
if re.search("404 Not Found", header.decode("utf-8")):
|
||||
print("Binary tag was not found")
|
||||
return 1
|
||||
|
||||
curlCmds = [
|
||||
['curl', '--remote-name', tarballUrl]
|
||||
]
|
||||
|
||||
for cmd in curlCmds:
|
||||
ret = subprocess.run(cmd).returncode
|
||||
if ret:
|
||||
return ret
|
||||
ret = subprocess.run(['curl', '--fail', '--remote-name', tarballUrl]).returncode
|
||||
if ret:
|
||||
return ret
|
||||
|
||||
hasher = hashlib.sha256()
|
||||
with open(tarball, "rb") as afile:
|
||||
|
|
Loading…
Reference in a new issue