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

Handle proxies in boostrap script

Browse source 
The urllib version used a `FancyURLOpener` which use urllib. But urllib does not not handle proxies with SSL well.
A better solution would be to use `requests` but I prefer to stay with the "no-dependency" approach.
This commit is contained in:
Damien 2015-04-14 10:13:15 +02:00
parent b7f59a3646
commit 1ee479707b
1 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

49
python/servo/bootstrap_commands.py
View file

@ -6,7 +6,7 @@ import shutil
import subprocess import subprocess
import sys import sys
import tarfile import tarfile
import urllib import urllib2
from mach.decorators import ( from mach.decorators import (
CommandArgument, CommandArgument,
@ -16,34 +16,41 @@ from mach.decorators import (
from servo.command_base import CommandBase, cd, host_triple from servo.command_base import CommandBase, cd, host_triple
class PanickyUrlOpener(urllib.FancyURLopener):
def http_error_default(self, url, fp, errcode, errmsg, headers): def download(desc, src, dst):
print("Download failed (%d): %s - %s" % (errcode, errmsg, url)) print("Downloading %s..." % desc)
dumb = (os.environ.get("TERM") == "dumb") or (not sys.stdout.isatty())
try:
resp = urllib2.urlopen(src)
fsize = int(resp.info().getheader('Content-Length').strip())
recved = 0
chunk_size = 8192
with open(dst, 'wb') as fd:
while True:
chunk = resp.read(chunk_size)
if not chunk: break
recved += len(chunk)
if not dumb:
pct = recved * 100.0 / fsize
print("\rDownloading %s: %5.1f%%" % (desc, pct), end="")
sys.stdout.flush()
fd.write(chunk)
if not dumb:
print()
except urllib2.HTTPError, e:
print("Download failed (%d): %s - %s" % (e.code, e.reason, src))
cpu_type = subprocess.check_output(["uname", "-m"]).strip().lower() cpu_type = subprocess.check_output(["uname", "-m"]).strip().lower()
if errcode == 404 and cpu_type in ["i386", "i486", "i686", "i768", "x86"]: if e.code == 404 and cpu_type in ["i386", "i486", "i686", "i768", "x86"]:
# i686 # i686
print("Note: Servo does not currently bootstrap 32bit snapshots of Rust") print("Note: Servo does not currently bootstrap 32bit snapshots of Rust")
print("See https://github.com/servo/servo/issues/3899") print("See https://github.com/servo/servo/issues/3899")
sys.exit(1) sys.exit(1)
def download(desc, src, dst):
recved = [0]
def report(count, bsize, fsize):
recved[0] += bsize
pct = recved[0] * 100.0 / fsize
print("\rDownloading %s: %5.1f%%" % (desc, pct), end="")
sys.stdout.flush()
print("Downloading %s..." % desc)
dumb = (os.environ.get("TERM") == "dumb") or (not sys.stdout.isatty())
PanickyUrlOpener().retrieve(src, dst, None if dumb else report)
if not dumb:
print()
def extract(src, dst, movedir=None): def extract(src, dst, movedir=None):
tarfile.open(src).extractall(dst) tarfile.open(src).extractall(dst)