diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-28 16:33:21 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-28 16:33:21 +0100 |
| commit | d9b4628aa1ca8bfeeef7c521990a67f2c5b56db6 (patch) | |
| tree | ea699d71cc0670b0ac5e416303fefa847ffd4156 /bin/reproducible_setup_pbuilder.sh | |
| parent | c534025eda52c6bcba00725be82726af1ce698e0 (diff) | |
| download | jenkins.debian.net-d9b4628aa1ca8bfeeef7c521990a67f2c5b56db6.tar.xz | |
reproducible: use proxy only for apt, but don't set http_proxy environment variable. see #780587 for more info
Diffstat (limited to 'bin/reproducible_setup_pbuilder.sh')
| -rwxr-xr-x | bin/reproducible_setup_pbuilder.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh index 189ebeb4..667e4658 100755 --- a/bin/reproducible_setup_pbuilder.sh +++ b/bin/reproducible_setup_pbuilder.sh @@ -88,9 +88,11 @@ setup_pbuilder() { echo "echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list" > ${TMPFILE} echo "echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list" >> ${TMPFILE} fi + # use host apt proxy configuration for pbuilder too + echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE} create_setup_tmpfile ${TMPFILE} "${PACKAGES}" - sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE - sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG} + sudo pbuilder --create --http-proxy $http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE + sudo pbuilder --execute --http-proxy $http_proxy --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG} echo echo "Now let's see whether the correct packages where installed..." for PKG in ${PACKAGES} ; do @@ -109,7 +111,7 @@ setup_pbuilder() { # update_pbuilder() { NAME=$1 - sudo pbuilder --update --basetgz /var/cache/pbuilder/${NAME}.tgz + sudo pbuilder --update --http-proxy $http_proxy --basetgz /var/cache/pbuilder/${NAME}.tgz } # |