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/d-i_build.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/d-i_build.sh')
-rwxr-xr-x | bin/d-i_build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh index 0e53866f..922ca71f 100755 --- a/bin/d-i_build.sh +++ b/bin/d-i_build.sh @@ -48,11 +48,11 @@ pdebuild_package() { # prepare build # if [ ! -f /var/cache/pbuilder/base.tgz ] ; then - sudo pbuilder --create + sudo pbuilder --create --http-proxy $http_proxy else ls -la /var/cache/pbuilder/base.tgz file /var/cache/pbuilder/base.tgz - sudo pbuilder --update || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create ) + sudo pbuilder --update --http-proxy $http_proxy || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create ) fi # # 3.0 quilt is not happy without an upstream tarball @@ -71,7 +71,7 @@ pdebuild_package() { else NUM_CPU=1 fi - pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b" + pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b" --http-proxy $http_proxy # cleanup echo cat /var/cache/pbuilder/result/${SOURCE}_*changes |