Always output license/copyright info with -version
#24409
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Concept ACK!
Heh. I did check the |
laanwj
reviewed
Feb 22, 2022
| @@ -42,7 +42,7 @@ | |||
| print(f'{abspath} not found or not an executable', file=sys.stderr) | |||
| sys.exit(1) | |||
| # take first line (which must contain version) | |||
| verstr = r.stdout.split('\n')[0] | |||
| verstr = r.stdout.splitlines()[0] | |||
| # last word of line is the actual version e.g. v22.99.0-5c6b3d5b3508 | |||
| verstr = verstr.split()[-1] | |||
| assert verstr.startswith('v') | |||
There was a problem hiding this comment.
The lines below here can go now ("Only bitcoin-qt prints the copyright message on --version, so store it specifically."). Could even store the copyright message per binary like the other version info.
Also another split('n') below.
There was a problem hiding this comment.
Thanks, should be addressed.
2b25810 to
0ed0d5d
Compare
Consolidate to outputting the licensing info when we pass -version to a binary, i.e bitcoind -version: ```bash itcoin Core version v22.99.0-fc1f355913f6-dirty Copyright (C) 2009-2022 The Bitcoin Core developers Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org/> for further information about the software. The source code is available from <https://github.com/bitcoin/bitcoin>. This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING or <https://opensource.org/licenses/MIT> ```
Co-authored-by: Carl Dong <contact@carldong.me>
0ed0d5d to
5a89bed
Compare
|
Updated table:
Also checked that manual pages are generated correctly. Tested ACK 5a89bed |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses a review comment from #24263, and addresses the comment where it was pointed out that we are inconsistent with emitting our copyright. After this change, the copyright is always emitted with
-version, rather than-help, i.e:The info is also added to binaries other than
bitcoind/bitcoin-qt. This change also prevents duplicate copyright info appearing in thebitcoindman page.