From 3407655c52c8369db99aedbc37f92f32697b601f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Mon, 18 Aug 2008 13:27:20 +0200 Subject: [PATCH] When https_proxy is in the environment, output a warning and disable it as urllib/urllib2 don't support it; see LP #122551. --- buildd | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) diff --git a/buildd b/buildd index 83c3605..2e892d4 100755 --- a/buildd +++ b/buildd @@ -21,6 +21,7 @@ # along with this program. If not, see . # +import os import re import sys import urllib2 @@ -80,6 +81,12 @@ elif op in ("retry", "rescore") and options.architecture: else: oneArch = False +# Clear https_proxy env var as it's not supported in urllib/urllib2; see +# LP #122551 +if os.environ.has_key('https_proxy'): + print >> sys.stderr, "Ignoring https_proxy (no support in urllib/urllib2; see LP #122551)" + del os.environ['https_proxy'] + # Prepare Launchpad cookie. launchpadCookie = common.prepareLaunchpadCookie() urlopener = common.setupLaunchpadUrlOpener(launchpadCookie) diff --git a/debian/changelog b/debian/changelog index 31ceb53..b4e02a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ubuntu-dev-tools (0.40ubuntu4) UNRELEASED; urgency=low * Replace .BB in doc/pbuilder-dist.1 with a newline to fix a syntax error. * Drop spurious tab in buildd. + * When https_proxy is in the environment, output a warning and disable it as + urllib/urllib2 don't support it; see LP #122551. -- Loic Minier Mon, 18 Aug 2008 12:21:58 +0200