Skip to content

Commit

Permalink
Merge bitcoin#17671: script: fixed wget call in gitian-build.py
Browse files Browse the repository at this point in the history
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
  • Loading branch information
MarcoFalke committed Dec 7, 2019
2 parents a8f5d5c + b11d35b commit 5622d8f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def build():
os.chdir('gitian-builder')
os.makedirs('inputs', exist_ok=True)

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

Expand Down
2 changes: 1 addition & 1 deletion doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Ensure gitian-builder is up-to-date:

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

Expand Down

0 comments on commit 5622d8f

Please sign in to comment.