From f360e350df2ca209bdc14aa2c4d787969c958423 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 14 Oct 2015 02:12:58 +0200 Subject: reproducible: refactor --- bin/reproducible_maintenance.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh index ae9b85cf..6a3cffee 100755 --- a/bin/reproducible_maintenance.sh +++ b/bin/reproducible_maintenance.sh @@ -43,7 +43,12 @@ fi echo "$(date -u) - updating the schroots and pbuilder now..." set +e +# use host architecture (only) ARCH=$(dpkg --print-architecture) +# use host apt proxy configuration for pbuilder +if [ ! -z "$http_proxy" ] ; then + pbuilder_http_proxy="--http-proxy $http_proxy" +fi for s in $SUITES ; do if [ "$ARCH" = "armhf" ] && [ "$s" != "unstable" ] ; then continue @@ -77,10 +82,6 @@ for s in $SUITES ; do else echo "$(date -u) - updating pbuilder for $s/$ARCH now." fi - # use host apt proxy configuration for pbuilder - if [ ! -z "$http_proxy" ] ; then - pbuilder_http_proxy="--http-proxy $http_proxy" - fi for i in 1 2 3 4 ; do [ ! -f /var/cache/pbuilder/$s-reproducible-base.tgz ] || sudo pbuilder --update $pbuilder_http_proxy --basetgz /var/cache/pbuilder/$s-reproducible-base.tgz RESULT=$? -- cgit v1.2.3-70-g09d2