Skip to content

Commit 5622d8f

Browse files
author
MarcoFalke
committed
Merge bitcoin#17671: script: fixed wget call in gitian-build.py
b11d35b Fixed wget call in gitian-build.py (willyk) Pull request description: Missing comma makes the gitian-builder script to download osslsigncode-2.0.tar.gz as osslsigncode-2.0.tar.gz-N, which makes the subsequent calls fail when building window binaries ACKs for top commit: laanwj: ACK b11d35b promag: ACK b11d35b. hebasto: ACK b11d35b, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: a74f6bec9e405fe57c2e53cc4ea0cb3546521b295478d02ae81a36306262e349e14395e46fd8106e72cc6a5bb80a88c8eff1ea38816af49c8b169c5715e84b0d
2 parents a8f5d5c + b11d35b commit 5622d8f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/gitian-build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def build():
5151
os.chdir('gitian-builder')
5252
os.makedirs('inputs', exist_ok=True)
5353

54-
subprocess.check_call(['wget', '-O' 'osslsigncode-2.0.tar.gz' '-N', '-P', 'inputs', 'https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz'])
54+
subprocess.check_call(['wget', '-O', 'inputs/osslsigncode-2.0.tar.gz', 'https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz'])
5555
subprocess.check_call(["echo '5a60e0a4b3e0b4d655317b2f12a810211c50242138322b16e7e01c6fbb89d92f inputs/osslsigncode-2.0.tar.gz' | sha256sum -c"], shell=True)
5656
subprocess.check_call(['make', '-C', '../bitcoin/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
5757

doc/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Ensure gitian-builder is up-to-date:
116116

117117
pushd ./gitian-builder
118118
mkdir -p inputs
119-
wget -O osslsigncode-2.0.tar.gz -P inputs https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz
119+
wget -O inputs/osslsigncode-2.0.tar.gz https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz
120120
echo '5a60e0a4b3e0b4d655317b2f12a810211c50242138322b16e7e01c6fbb89d92f inputs/osslsigncode-2.0.tar.gz' | sha256sum -c
121121
popd
122122

0 commit comments

Comments
 (0)