From 1056f014a3dc9ac733aed0e6e59db958e5c6ff59 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 19 Sep 2017 14:42:56 +0100 Subject: [PATCH] Add a patch to fix FTBFS in non-English locales --- debian/changelog | 1 + ...-unset-LANGUAGE-after-setting-LC_ALL.patch | 31 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch diff --git a/debian/changelog b/debian/changelog index 875618b9..b89bb87f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ostree (2017.11-2) UNRELEASED; urgency=medium * Replace patch with the version applied upstream in 2017.12 * Standards-Version: 4.1.0 (no changes) + * Add a patch to fix FTBFS in non-English locales -- Simon McVittie Tue, 19 Sep 2017 10:37:12 +0100 diff --git a/debian/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch b/debian/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch new file mode 100644 index 00000000..f540eef2 --- /dev/null +++ b/debian/patches/2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch @@ -0,0 +1,31 @@ +From: Simon McVittie +Date: Tue, 19 Sep 2017 14:41:18 +0100 +Subject: tests: Explicitly unset LANGUAGE after setting LC_ALL + +As a GNU extension, LANGUAGE takes precedence over LC_ALL for +gettext(3) whenever the locale is not C, causing tests that grep for +specific English strings to fail when run in non-English locales. +The upstream glibc proposal for C.UTF-8 would give C.UTF-8 the same +special case as C here, but the implementation in Debian does not +currently have this, so we have to unset LANGUAGE too. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/1188 +Applied-upstream: 2017.12, commit:223c940b46a4bb335665df7436566b73cdf0effd +--- + tests/libtest-core.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index d0b7d37..ce0e4bb 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -40,6 +40,8 @@ if locale -a | grep C.UTF-8 >/dev/null; then + else + export LC_ALL=C + fi ++# A GNU extension, used whenever LC_ALL is not C ++unset LANGUAGE + + # This should really be the default IMO + export G_DEBUG=fatal-warnings diff --git a/debian/patches/series b/debian/patches/series index 83f098ba..58db0ab7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch +2017.12/tests-Explicitly-unset-LANGUAGE-after-setting-LC_ALL.patch