[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: include locales-all in pbuilder tgz

[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 c6adeaf4ea3bea48c6d2e05b484d2a7cd2ad56c9
Author: Reiner Herrmann <reiner at reiner-h.de>
Date:   Wed May 13 23:53:26 2015 +0200

    reproducible: include locales-all in pbuilder tgz
    
    It is currently intended that both builds are built with
    different locales to get more variation.
    In reproducible_build.sh LC_ALL is set to fr_CH.UTF-8.
    But the minimal pbuilder currently doesn't know this locale,
    so e.g. calling `date` still outputs English strings.
    By including locales-all in the pbuilder tgz, all locales
    will be available.
---
 bin/reproducible_setup_pbuilder.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index ea407d2..1134f77 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -80,6 +80,7 @@ setup_pbuilder() {
 	NAME=$1
 	shift
 	PACKAGES="$@"
+	EXTRA_PACKAGES="locales-all"
 	echo "$(date) - creating /var/cache/pbuilder/${NAME}.tgz now..."
 	TMPFILE=$(mktemp)
 	LOG=$(mktemp)
@@ -94,7 +95,7 @@ setup_pbuilder() {
 		pbuilder_http_proxy="--http-proxy $http_proxy"
 	fi
 	create_setup_tmpfile ${TMPFILE} "${PACKAGES}"
-	sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE
+	sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --extrapackages "$EXTRA_PACKAGES"
 	if [ "$DEBUG" = "true" ] ; then
 		cat "$TMPFILE"
 	fi

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