From 35eb7ec0780396b6ca95e117aa75978ce1ee2679 Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Fri, 3 Sep 2010 03:41:02 +0200
Subject: Make /etc/make.tinderbox.private.conf the place to set BTI and PROXY
 settings.

Make bti in bashrc use the TINDERBOX_PROXY variable rather than BTI_PROXY,
and also set curl (with proxy) for fetch and resume.

Note: don't set the proxy in the environment or the isolation will fail;
unfortunately wget can be told to ignore proxies but _not_ to use them, on
the command line, which is why we went with curl.
---
 tinderbox.make.conf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tinderbox.make.conf')

diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index dd20717..7dedf5b 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -14,6 +14,11 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+source /etc/make.tinderbox.private.conf
+
+FETCHCOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --output \${DISTDIR}/\${FILE} \${URI}"
+RESUMECOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}"
+
 FEATURES="test test-fail-continue -unmerge-logs split-log userpriv usersandbox compress-build-logs -preserve-libs"
 
 ACCEPT_LICENSE="*"
-- 
cgit v1.2.3-65-gdbad