diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-30 01:54:44 -0700 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-30 01:54:44 -0700 |
| commit | a98a53925f09a1b1d65c4680ca7990f9ac3ee1bc (patch) | |
| tree | 79bd72eb12912151bef9f66b48268a1a64111ab9 /python | |
| parent | fbf98214c91ce3bb52c32ec4a5e121023843f1eb (diff) | |
| parent | 3103cd4b34e5e1da7c209b666a6f13bbbe02b63b (diff) | |
| download | servo-a98a53925f09a1b1d65c4680ca7990f9ac3ee1bc.tar.gz servo-a98a53925f09a1b1d65c4680ca7990f9ac3ee1bc.zip | |
Auto merge of #10901 - askeing:fix_10882, r=jdm
Handle HTTP specific errors then other errors when downloading rustc
fix #10882
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10901)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/bootstrap_commands.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index d49c1e431c9..044cd8c80c4 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -63,11 +63,14 @@ def download(desc, src, writer, start_byte=0): if not dumb: print() - except urllib2.URLError: - print("Error downloading Rust compiler; are you connected to the internet?") - sys.exit(1) except urllib2.HTTPError, e: print("Download failed (%d): %s - %s" % (e.code, e.reason, src)) + if e.code == 403: + print("No Rust compiler binary available for this platform. " + "Please see https://github.com/servo/servo/#prerequisites") + sys.exit(1) + except urllib2.URLError: + print("Error downloading Rust compiler; are you connected to the internet?") sys.exit(1) except KeyboardInterrupt: writer.flush() |