diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-12-07 09:56:07 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-07 09:56:10 -0500 |
| commit | 5622d8f3156a293e61d0964c33d4b21d8c9fd5e0 (patch) | |
| tree | dffcfb816780bab49bd99dbe361793bb1505cedb | |
| parent | a8f5d5c6b9fc2250b9c0d856c0885ce8fec83de8 (diff) | |
| parent | b11d35b5e2dd09ab816d688d8ac0264b43f7f844 (diff) | |
Merge #17671: script: fixed wget call in gitian-build.py
b11d35b5e2dd09ab816d688d8ac0264b43f7f844 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 b11d35b5e2dd09ab816d688d8ac0264b43f7f844
promag:
ACK b11d35b5e2dd09ab816d688d8ac0264b43f7f844.
hebasto:
ACK b11d35b5e2dd09ab816d688d8ac0264b43f7f844, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: a74f6bec9e405fe57c2e53cc4ea0cb3546521b295478d02ae81a36306262e349e14395e46fd8106e72cc6a5bb80a88c8eff1ea38816af49c8b169c5715e84b0d
| -rwxr-xr-x | contrib/gitian-build.py | 2 | ||||
| -rw-r--r-- | doc/release-process.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index 712352d6b7..e38fa6fcb0 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -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']) diff --git a/doc/release-process.md b/doc/release-process.md index 6d1e7c69e9..36d79a0c34 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -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 |