[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Use et_EE instead of fr_CH as locale+language variation

[Holger Levsen]

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


Commits:
d1f68a80 by Adrian Bunk at 2020-01-23T01:44:35+02:00
Use et_EE instead of fr_CH as locale+language variation

Replace the third Swiss locale with Estonian.

In Estonian 'z' is sorted between 's' and 't',
which is contrary to common incorrect assumptions
about the sorting order of ASCII characters.

- - - - -


2 changed files:

- bin/reproducible_build.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -664,8 +664,8 @@ second_build() {
 		i386)	locale=de_CH
 			language=de
 			;;
-		*)	locale=fr_CH
-			language=fr
+		*)	locale=et_EE
+			language=et
 			;;
 	esac
 	cat > "$TMPCFG" << EOF


=====================================
bin/reproducible_common.sh
=====================================
@@ -463,16 +463,16 @@ write_variation_table() {
 	fi
 	write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>"
 	if [ "$1" = "debian" ]  ; then
-		write_page "<tr><td>env LANG</td><td>LANG=\"C\"</td><td>on amd64: LANG=\"fr_CH.UTF-8\"<br />on i386: LANG=\"de_CH.UTF-8\"<br />on arm64: LANG=\"nl_BE.UTF-8\"<br />on armhf: LANG=\"it_CH.UTF-8\"</td></tr>"
-		write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>on amd64: LANGUAGE=\"fr_CH:fr\"<br />on i386: LANGUAGE=\"de_CH:de\"<br />on arm64: LANGUAGE=\"nl_BE:nl\"<br />on armhf: LANGUAGE=\"it_CH:it\"</td></tr>"
-		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>on amd64: LC_ALL=\"fr_CH.UTF-8\"<br />on i386: LC_ALL=\"de_CH.UTF-8\"<br />on arm64: LC_ALL=\"nl_BE.UTF-8\"<br />on armhf: LC_ALL=\"it_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LANG</td><td>LANG=\"C\"</td><td>on amd64: LANG=\"et_EE.UTF-8\"<br />on i386: LANG=\"de_CH.UTF-8\"<br />on arm64: LANG=\"nl_BE.UTF-8\"<br />on armhf: LANG=\"it_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>on amd64: LANGUAGE=\"et_EE:et\"<br />on i386: LANGUAGE=\"de_CH:de\"<br />on arm64: LANGUAGE=\"nl_BE:nl\"<br />on armhf: LANGUAGE=\"it_CH:it\"</td></tr>"
+		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>on amd64: LC_ALL=\"et_EE.UTF-8\"<br />on i386: LC_ALL=\"de_CH.UTF-8\"<br />on arm64: LC_ALL=\"nl_BE.UTF-8\"<br />on armhf: LC_ALL=\"it_CH.UTF-8\"</td></tr>"
 	elif [ "$1" = "Arch Linux" ]  ; then
-		write_page "<tr><td>env LANG</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
-		write_page "<tr><td>env LC_ALL</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LANG</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LANG=\"et_EE.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LC_ALL</td><td><em>LANG=\"en_US.UTF-8\"</em></td><td>LC_ALL=\"et_EE.UTF-8\"</td></tr>"
 		write_page "<tr><td>the build path</td><td colspan=\"2\">is not yet varied between rebuilds of Arch Linux</td></tr>"
 	else
-		write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
-		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"et_EE.UTF-8\"</td></tr>"
+		write_page "<tr><td>env LC_ALL</td><td><em>not set</em></td><td>LC_ALL=\"et_EE.UTF-8\"</td></tr>"
 	fi
 	if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ]  ; then
 		write_page "<tr><td>env PATH</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"</td></tr>"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/d1f68a8001ff9e5de7d8eea03fb3ebc43a5ea4a5
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/20200123/6fe0c815/attachment-0001.html>