diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-06 11:34:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-06 11:34:20 -0500 |
commit | 8b6c1e759438f21e2072ce36eb97130dd7d0e182 (patch) | |
tree | b5ded002351c504684e5b2d2480ef71d29526566 | |
parent | 5c7a4db5f4e374dee287d403d90c7bc0e07ac9d0 (diff) | |
parent | f80958d2e87d298f267f0afc8c73d8090973e4c8 (diff) | |
download | servo-8b6c1e759438f21e2072ce36eb97130dd7d0e182.tar.gz servo-8b6c1e759438f21e2072ce36eb97130dd7d0e182.zip |
Auto merge of #25434 - pshaughn:patch-1, r=jdm
Put correct version number in rustup version-requirement string
Just fixing a little typo that confused me when I saw it come up.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r-- | python/servo/command_base.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index ee6ee0e450d..31eb17800ae 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -1033,13 +1033,14 @@ install them, let us know by filing a bug!") print("It looks like rustup is not installed. See instructions at " "https://github.com/servo/servo/#setting-up-your-environment") print() - return 1 + sys.exit(1) raise version = tuple(map(int, re.match(b"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups())) - if version < (1, 21, 0): - print("rustup is at version %s.%s.%s, Servo requires 1.11.0 or more recent." % version) + version_needed = (1, 21, 0) + if version < version_needed: + print("rustup is at version %s.%s.%s, Servo requires %s.%s.%s or more recent." % (version + version_needed)) print("Try running 'rustup self update'.") - return 1 + sys.exit(1) def ensure_clobbered(self, target_dir=None): if target_dir is None: |