[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible: refactor

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit f360e350df2ca209bdc14aa2c4d787969c958423
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Oct 14 02:12:58 2015 +0200

    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 ae9b85c..6a3cffe 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=$?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git