diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-01-03 17:12:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 17:12:10 +0100 |
| commit | 258a0fb89eba4ffb1d492401ce7176311ded8927 (patch) | |
| tree | 04949b011882cb211f47dc617f6d2c83af0d300b /src/bootstrap | |
| parent | b435960c4cfd3975651c7051be56d7f5d6c201ab (diff) | |
| parent | 85f649fd27754cf54dff48131b87800a02edb948 (diff) | |
| download | rust-258a0fb89eba4ffb1d492401ce7176311ded8927.tar.gz rust-258a0fb89eba4ffb1d492401ce7176311ded8927.zip | |
Rollup merge of #104552 - DebugSteven:warn-newer-x, r=jyn514
warn newer available version of the x tool This PR adds a check to `tidy` to assert that the installed version of `x` is equal to the version in `src/tools/x/Cargo.toml`. It adds a `--wrapper-version` argument to `x` to determine the version at runtime, . It does not warn if `x` has not yet been installed, on the assumption that the user isn't interested in using it.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 9cf43fc7a21..f3998e98583 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -934,8 +934,7 @@ def main(): if len(sys.argv) > 1 and sys.argv[1] == 'help': sys.argv = [sys.argv[0], '-h'] + sys.argv[2:] - help_triggered = ( - '-h' in sys.argv) or ('--help' in sys.argv) or (len(sys.argv) == 1) + help_triggered = len(sys.argv) == 1 or any(x in ["-h", "--help", "--version"] for x in sys.argv) try: bootstrap(help_triggered) if not help_triggered: |