From c508fa0c4159f93df077a2d46ed481fd5d8c8803 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 6 Nov 2012 15:28:29 -0500
Subject: tools/Z99-cloud-locale-test.sh: avoid warning when shell is zsh

LP: #1073077
---
 ChangeLog                      | 2 ++
 tools/Z99-cloud-locale-test.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d03c0293..1243ce7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
  - cc_landscape: restart landscape after install or config (LP: #1070345)
  - multipart/archive.  do not fail on unknown headers in multipart
    mime or cloud-archive config (LP: #1065116).
+ - tools/Z99-cloud-locale-test.sh: avoid warning when user's shell is
+   zsh (LP: #1073077)
 0.7.0:
  - add a 'exception_cb' argument to 'wait_for_url'.  If provided, this
    method will be called back with the exception received and the message.
diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh
index 8ad485e8..4012beeb 100755
--- a/tools/Z99-cloud-locale-test.sh
+++ b/tools/Z99-cloud-locale-test.sh
@@ -22,7 +22,7 @@ locale_warn() {
 		case "$w1" in
 			locale:) bad_names="${bad_names} ${w4}";;
 			*)
-				key=${w1%%=*}
+				key=${w1%%\=*}
 				val=${w1#*=}
 				val=${val#\"}
 				val=${val%\"}
@@ -31,7 +31,7 @@ locale_warn() {
 	done
 	for bad in $bad_names; do
 		for var in ${vars}; do
-			[ "${bad}" = "${var%=*}" ] || continue
+			[ "${bad}" = "${var%\=*}" ] || continue
 			value=${var#*=}
 			[ "${bad_lcs#* ${value}}" = "${bad_lcs}" ] &&
         			bad_lcs="${bad_lcs} ${value}"
-- 
cgit v1.2.3