From 56220bdd23b79d2e8c94ee95115d03f4507c7ce0 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 25 Oct 2011 19:25:09 -0400
Subject: [PATCH] respect DEBOOTSTRAP_PROXY

if set in environment or config file DEBOOTSTRAP_PROXY takes precedence
over the larger scoped environment variable 'http_proxy'.
---
 mk-sbuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mk-sbuild b/mk-sbuild
index df2e9e5..56a5646 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -459,6 +459,8 @@ if [ -n "$DEBOOTSTRAP_EXCLUDE" ] ; then
 fi
 
 # if http_proxy is set in the environment (even empty) set 'proxy' to it
+[ "$proxy" = "_unset_" -a "${DEBOOTSTRAP_PROXY-xx}" = "xx" ] &&
+    proxy=${DEBOOTSTRAP_PROXY}
 [ "$proxy" = "_unset_" -a "${http_proxy-xx}" = "xx" ] && proxy=${http_proxy}
 if [ "$proxy" = "_unset_" ]; then
    _out=$(apt-config shell x Acquire::HTTP::Proxy) &&