This is an automated email from the git hooks/post-receive script. adconrad pushed a commit to branch glibc-2.23 in repository glibc.
commit cf7bcc4b0e2d7dd70ebe69d6a7704412334d5e0d Author: Adam Conrad <[email protected]> Date: Tue Mar 22 18:45:33 2016 -0600 debian/debhelper.in/locales.config: Make default_environment_locale get preseeded correctly both with and without /etc/default/locale. --- debian/changelog | 2 ++ debian/debhelper.in/locales.config | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 43deb5c..f0dd724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium [ Adam Conrad ] * debian/patches/any/cvs-tst-malloc-thread-exit.diff: Backport fix from upstream to make tst-malloc-thread-exit use fewer system resources. + * debian/debhelper.in/locales.config: Make default_environment_locale + get preseeded correctly both with and without /etc/default/locale. * debian/control.in/i386: Remove list of Breaks that predate oldstable. * debian/control.in/*: Drop long obsolete file overlap Breaks/Replaces. diff --git a/debian/debhelper.in/locales.config b/debian/debhelper.in/locales.config index ffa35c9..bdf584d 100644 --- a/debian/debhelper.in/locales.config +++ b/debian/debhelper.in/locales.config @@ -50,8 +50,10 @@ fi DEFAULT_ENVIRONMENT="$(cat /etc/environment /etc/default/locale 2>/dev/null | awk '/^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')" DEFAULT_ENVIRONMENT="$(convert_locale "$DEFAULT_ENVIRONMENT")" -if ! echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then +if [ -n "$SUPPORTED_LOCALES" ] && [ -n "$DEFAULT_ENVIRONMENT" ]; then + if echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT" + fi fi STATE=1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
