mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto merge of #34597 - CensoredUsername:bootstrap-fix, r=alexcrichton

Browse source 
Support more python 2.7 versions in bootstrap.py

It seems python broke compatability between 2.7.9  and 2.7.12 as on the former a WindowsError was raised while on the latter a subprocess.CalledProcessError was raised while testing for the existence of uname.

As a WindowsError being thrown obviously indicates we're running on windows, this should probably be accepted too.
This commit is contained in:
bors 2016-07-02 23:33:54 -07:00 • committed by GitHub
commit d9e8a67894
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/bootstrap.py
View file

@ -265,7 +265,7 @@ class RustBuild:
try: try:
ostype = subprocess.check_output(['uname', '-s']).strip() ostype = subprocess.check_output(['uname', '-s']).strip()
cputype = subprocess.check_output(['uname', '-m']).strip() cputype = subprocess.check_output(['uname', '-m']).strip()
except subprocess.CalledProcessError: except (subprocess.CalledProcessError, WindowsError):
if sys.platform == 'win32': if sys.platform == 'win32':
return 'x86_64-pc-windows-msvc' return 'x86_64-pc-windows-msvc'
err = "uname not found" err = "uname not found"