Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid hardcoded references to rustc in download()

Browse source 
Use the `desc` parameter instead to make the error messages
customized for the actual download.

Also use new-style format strings.
This commit is contained in:
Aneesh Agrawal 2017-01-15 15:19:13 -05:00
parent 02b054ec9e
commit ef900cbdcb
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/util.py
View file

@ -67,9 +67,9 @@ def host_triple():
def download(desc, src, writer, start_byte=0): def download(desc, src, writer, start_byte=0):
if start_byte: if start_byte:
print("Resuming download of %s..." % desc) print("Resuming download of {}...".format(desc))
else: else:
print("Downloading %s..." % desc) print("Downloading {}...".format(desc))
dumb = (os.environ.get("TERM") == "dumb") or (not sys.stdout.isatty()) dumb = (os.environ.get("TERM") == "dumb") or (not sys.stdout.isatty())
try: try:
@ -101,16 +101,16 @@ def download(desc, src, writer, start_byte=0):
if not dumb: if not dumb:
print() print()
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
print("Download failed (%d): %s - %s" % (e.code, e.reason, src)) print("Download failed ({}): {} - {}".format(e.code, e.reason, src))
if e.code == 403: if e.code == 403:
print("No Rust compiler binary available for this platform. " print("No Rust compiler binary available for this platform. "
"Please see https://github.com/servo/servo/#prerequisites") "Please see https://github.com/servo/servo/#prerequisites")
sys.exit(1) sys.exit(1)
except urllib2.URLError, e: except urllib2.URLError, e:
print("Error downloading Rust compiler: %s. The failing URL was: %s" % (e.reason, src)) print("Error downloading {}: {}. The failing URL was: {}".format(desc, e.reason, src))
sys.exit(1) sys.exit(1)
except socket_error, e: except socket_error, e:
print("Looks like there's a connectivity issue, check your Internet connection. %s" % (e)) print("Looks like there's a connectivity issue, check your Internet connection. {}".format(e))
sys.exit(1) sys.exit(1)
except KeyboardInterrupt: except KeyboardInterrupt:
writer.flush() writer.flush()