summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2009-05-12 13:28:58 +0200
committerLoïc Minier <lool@dooz.org>2009-05-12 13:28:58 +0200
commit9cd6725fa7ce15d8dc91aa0ceac0f2f26a4a5582 (patch)
tree18d9b3912ddf21900c2166bbbc93fc27e20b77e0
parent3efbb08badd17bf229c43b4ba5154029bef4fc45 (diff)
downloadpython-apt-9cd6725fa7ce15d8dc91aa0ceac0f2f26a4a5582.tar.gz
Unsset https_proxy in pre-build.sh to workaround LP #94130.
-rw-r--r--debian/changelog1
-rwxr-xr-xpre-build.sh4
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ac49f2b..5e0c2709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical
[ Loic Minier ]
* Update mirror list from LP.
+ * Unsset https_proxy in pre-build.sh to workaround LP #94130.
-- Michael Casadevall <mcasadevall@blacksteel> Tue, 12 May 2009 05:53:07 -0400
diff --git a/pre-build.sh b/pre-build.sh
index 0b51a84c..29effc13 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -1,4 +1,8 @@
#!/bin/sh
echo "updating mirror list from launchpad"
+if [ -n "$https_proxy" ]; then
+ echo "disabling https_proxy as Python's urllib doesn't support it; see #94130"
+ unset https_proxy
+fi
utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors