diff --git a/debian/changelog b/debian/changelog index 98bb4a6..bdf9095 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ ubuntu-dev-tools (0.140) UNRELEASED; urgency=low + [ Stefano Rivera ] * Bump Standards-Version to 3.9.3, no changes needed. * Update machine-readable copyright Format to 1.0. * pbuilder-dist: Use the same chroot, whether the system-architecture was the supplied architecture or was chosen by default (LP: #943435) - -- Stefano Rivera Sat, 25 Feb 2012 16:09:53 +0200 + [ Daniel Hahler ] + * ubuntutools/archive.py: use ProxyHandler in _download_file. + This makes use of the system proxy (e.g. http_proxy). + + -- Daniel Hahler Fri, 16 Mar 2012 16:21:00 +0100 ubuntu-dev-tools (0.139) unstable; urgency=low diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py index 40d15a6..2cde8dd 100644 --- a/ubuntutools/archive.py +++ b/ubuntutools/archive.py @@ -317,8 +317,10 @@ class SourcePackage(object): if parsed.scheme == 'file': in_ = open(parsed.path, 'r') else: + proxy = urllib2.ProxyHandler() # uses default proxy from environment + opener = urllib2.build_opener(proxy) try: - in_ = urllib2.urlopen(url) + in_ = opener.open(url) except urllib2.URLError: return False