foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

verifybinaries: remove awkward bitcoin-core prefix handling

Browse source
This commit is contained in:
Cory Fields 2023-04-04 20:34:58 +00:00
parent c44323a717
commit 6d11830265
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/verifybinaries/README.md
View file

@ -44,8 +44,6 @@ Validate releases with default settings:
```sh
./contrib/verifybinaries/verify.py pub 22.0
./contrib/verifybinaries/verify.py pub 22.0-rc2
./contrib/verifybinaries/verify.py pub bitcoin-core-23.0
./contrib/verifybinaries/verify.py pub bitcoin-core-23.0-rc1
```
Get JSON output and don't prompt for user input (no auto key import):
@ -66,12 +64,12 @@ specified keys, while requiring a threshold of at least 10 trusted signatures:
If you only want to download the binaries of certain platform, add the corresponding suffix, e.g.:
```sh
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-osx
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-rc2-win64
./contrib/verifybinaries/verify.py pub 22.0-osx
./contrib/verifybinaries/verify.py pub 22.0-rc2-win64
```
If you do not want to keep the downloaded binaries, specify anything as the second parameter.
```sh
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0 delete
./contrib/verifybinaries/verify.py pub 22.0 delete
```

7
contrib/verifybinaries/verify.py
View file

@ -99,9 +99,6 @@ VERSION_FORMAT = "<major>.<minor>[.<patch>][-rc[0-9]][-platform]"
VERSION_EXAMPLE = "22.0-x86_64 or 0.21.0-rc2-osx"
def parse_version_string(version_str):
if version_str.startswith(VERSIONPREFIX): # remove version prefix
version_str = version_str[len(VERSIONPREFIX):]
parts = version_str.split('-')
version_base = parts[0]
version_rc = ""
@ -290,8 +287,8 @@ def get_files_from_hosts_and_compare(
log.error(
f"couldn't fetch file ({url}). "
"Have you specified the version number in the following format?\n"
f"[{VERSIONPREFIX}]{VERSION_FORMAT} "
f"(example: {VERSIONPREFIX}{VERSION_EXAMPLE})\n"
f"{VERSION_FORMAT} "
f"(example: {VERSION_EXAMPLE})\n"
f"wget output:\n{indent(output)}")
return ReturnCode.FILE_GET_FAILED
else: