Browse code
Revert "stackrc set the LC_ALL to C"
This reverts commit f327b1e1196eacf25e7c4c9e3a7ad30c53bb961c.
The problem being addressed in the original commit was that
rejoin-stack.sh would run with the user's locale, instead of C that
was set in stack.sh
We overlooked that this gets pulled in by openrc, so it is overriding
the user's locale when using clients, etc.
rejoin-stack.sh was removed in
I2f61bb69cc110468a91dcaa4ee7653ede7048467 so we don't have to worry
about that part. A revert to not touch the user's locale seems
appropriate.
Change-Id: I7c858bb92ce7ba5b5d323bf3ad6776100026c7a2
Closes-Bug: #1608687
Ian Wienand authored on 2016/08/04 14:17:38Showing 2 changed files
| ... | ... |
@@ -27,6 +27,13 @@ set -o xtrace |
| 27 | 27 |
# Make sure custom grep options don't get in the way |
| 28 | 28 |
unset GREP_OPTIONS |
| 29 | 29 |
|
| 30 |
+# Sanitize language settings to avoid commands bailing out |
|
| 31 |
+# with "unsupported locale setting" errors. |
|
| 32 |
+unset LANG |
|
| 33 |
+unset LANGUAGE |
|
| 34 |
+LC_ALL=C |
|
| 35 |
+export LC_ALL |
|
| 36 |
+ |
|
| 30 | 37 |
# Make sure umask is sane |
| 31 | 38 |
umask 022 |
| 32 | 39 |
|
| ... | ... |
@@ -7,13 +7,6 @@ |
| 7 | 7 |
[[ -z "$_DEVSTACK_STACKRC" ]] || return 0 |
| 8 | 8 |
declare -r _DEVSTACK_STACKRC=1 |
| 9 | 9 |
|
| 10 |
-# Sanitize language settings to avoid commands bailing out |
|
| 11 |
-# with "unsupported locale setting" errors. |
|
| 12 |
-unset LANG |
|
| 13 |
-unset LANGUAGE |
|
| 14 |
-LC_ALL=C |
|
| 15 |
-export LC_ALL |
|
| 16 |
- |
|
| 17 | 10 |
# Find the other rc files |
| 18 | 11 |
RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
|
| 19 | 12 |
|