diff options
| author | bors <bors@rust-lang.org> | 2016-07-02 23:33:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 23:33:54 -0700 |
| commit | d9e8a67894a10d5daf5ea3d3b6e3a207a0dbbddb (patch) | |
| tree | 0e1c79c6765f7897cf5e047ebbdf7409a66a87f7 /src | |
| parent | ecbfa4749ab306160cee0c45fde3b0c04356ece1 (diff) | |
| parent | ad88d50fba26c653f592be6a5032a33a0c35d276 (diff) | |
| download | rust-d9e8a67894a10d5daf5ea3d3b6e3a207a0dbbddb.tar.gz rust-d9e8a67894a10d5daf5ea3d3b6e3a207a0dbbddb.zip | |
Auto merge of #34597 - CensoredUsername:bootstrap-fix, r=alexcrichton
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 7b0a5d6b6df..9606a741cc0 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -265,7 +265,7 @@ class RustBuild: try: ostype = subprocess.check_output(['uname', '-s']).strip() cputype = subprocess.check_output(['uname', '-m']).strip() - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, WindowsError): if sys.platform == 'win32': return 'x86_64-pc-windows-msvc' err = "uname not found" |