From f327b1e1196eacf25e7c4c9e3a7ad30c53bb961c Mon Sep 17 00:00:00 2001 From: Einst Crazy Date: Thu, 24 Sep 2015 18:50:30 +0800 Subject: [PATCH] stackrc set the LC_ALL to C It will report 'unknown locale: UTF-8', when the env is UTF-8. Default set the LC_ALL to C in the stackrc, instead. And delete the duplicate option in stack.sh. Closes-Bug: 1499296 Change-Id: I14121b25ac314a1a93e6dd6811e196ce2a7c0eb5 --- stack.sh | 7 ------- stackrc | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack.sh b/stack.sh index d8ab52ec98..5e57274d64 100755 --- a/stack.sh +++ b/stack.sh @@ -28,13 +28,6 @@ set -o xtrace # Make sure custom grep options don't get in the way unset GREP_OPTIONS -# Sanitize language settings to avoid commands bailing out -# with "unsupported locale setting" errors. -unset LANG -unset LANGUAGE -LC_ALL=C -export LC_ALL - # Make sure umask is sane umask 022 diff --git a/stackrc b/stackrc index fdde62f50c..82c6885db9 100644 --- a/stackrc +++ b/stackrc @@ -7,6 +7,13 @@ [[ -z "$_DEVSTACK_STACKRC" ]] || return 0 declare -r _DEVSTACK_STACKRC=1 +# Sanitize language settings to avoid commands bailing out +# with "unsupported locale setting" errors. +unset LANG +unset LANGUAGE +LC_ALL=C +export LC_ALL + # Find the other rc files RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)