[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] d-i: fixup last commit, use --http-proxy correctly

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
1888d310 by Holger Levsen at 2018-10-15T15:28:52Z
d-i: fixup last commit, use --http-proxy correctly

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/d-i_build.sh
- bin/d-i_manual.sh


Changes:

=====================================
bin/d-i_build.sh
=====================================
@@ -110,19 +110,25 @@ pdebuild_package() {
 	#
 	# prepare build
 	#
+	# use host apt proxy configuration for pbuilder too
+	if [ ! -z "$http_proxy" ] ; then
+		echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
+		pbuilder_http_proxy="--http-proxy $http_proxy"
+	fi
+	# setup base.tgz
 	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
-		sudo pbuilder --create --http-proxy $http_proxy
+		sudo pbuilder --create $pbuilder_http_proxy
 		TMPFILE=$(mktemp)
 		cat >> $TMPFILE <<- EOF
 # Preseeding man-db/auto-update to false
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
 EOF
-		sudo pbuilder --execute $http_proxy --save-after-exec -- ${TMPFILE}
+		sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec -- ${TMPFILE}
 		rm ${TMPFILE}
 	else
 		ls -la /var/cache/pbuilder/base.tgz
 		file /var/cache/pbuilder/base.tgz
-		sudo pbuilder --update --http-proxy $http_proxy || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create )
+		sudo pbuilder --update $pbuilder_http_proxy || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create $pbuilder_http_proxy)
 	fi
 	#
 	# 3.0 quilt is not happy without an upstream tarball


=====================================
bin/d-i_manual.sh
=====================================
@@ -38,19 +38,26 @@ pdebuild_package() {
 	#
 	# prepare build
 	#
-	if [ -f /var/cache/pbuilder/base.tgz ] ; then
-		sudo pbuilder --create --http-proxy $http_proxy
+	# use host apt proxy configuration for pbuilder too
+	if [ ! -z "$http_proxy" ] ; then
+		echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
+		pbuilder_http_proxy="--http-proxy $http_proxy"
+	fi
+	# setup base.tgz
+	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
+		sudo pbuilder --create $pbuilder_http_proxy
 		TMPFILE=$(mktemp)
 		cat >> $TMPFILE <<- EOF
 # Preseeding man-db/auto-update to false
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
 EOF
-		sudo pbuilder --execute $http_proxy --save-after-exec -- ${TMPFILE}
+		sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec -- ${TMPFILE}
 		rm ${TMPFILE}
 	else
-		sudo pbuilder --update --http-proxy $http_proxy
+		ls -la /var/cache/pbuilder/base.tgz
+		file /var/cache/pbuilder/base.tgz
+		sudo pbuilder --update $pbuilder_http_proxy || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create $pbuilder_http_proxy)
 	fi
-
 	#
 	# build
 	#



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/1888d310edd9d135dce275a1a81c147e2b78ea06

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/1888d310edd9d135dce275a1a81c147e2b78ea06
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181015/08405376/attachment-0001.html>