summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-14 02:12:58 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-14 02:12:58 +0200
commitf360e350df2ca209bdc14aa2c4d787969c958423 (patch)
tree76c66bad16628572abeab565e8a54ce04af5da05
parentefba4df20bf350d668ac6982ee3dc9fd84e90a96 (diff)
downloadjenkins.debian.net-f360e350df2ca209bdc14aa2c4d787969c958423.tar.xz
reproducible: refactor
-rwxr-xr-xbin/reproducible_maintenance.sh9
1 files 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=$?