Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25434 - pshaughn:patch-1, r=jdm

Browse source 
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. -->
This commit is contained in:
bors-servo 2020-01-06 11:34:20 -05:00 • committed by GitHub
commit 8b6c1e7594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/command_base.py
View file

@ -1033,13 +1033,14 @@ install them, let us know by filing a bug!")
print("It looks like rustup is not installed. See instructions at " print("It looks like rustup is not installed. See instructions at "
"https://github.com/servo/servo/#setting-up-your-environment") "https://github.com/servo/servo/#setting-up-your-environment")
print() print()
return 1 sys.exit(1)
raise raise
version = tuple(map(int, re.match(b"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups())) version = tuple(map(int, re.match(b"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups()))
if version < (1, 21, 0): version_needed = (1, 21, 0)
print("rustup is at version %s.%s.%s, Servo requires 1.11.0 or more recent." % version) 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'.") print("Try running 'rustup self update'.")
return 1 sys.exit(1)
def ensure_clobbered(self, target_dir=None): def ensure_clobbered(self, target_dir=None):
if target_dir is None: if target_dir is None: