t0200: "locale" may not exist

gitster · gitster · commit 7b90363099e5 · 2012-12-19T07:44:20.000-08:00
On systems without "locale" installed, t0200-gettext-basic.sh leaked
error messages when checking if some test locales are available.
Hide them, as they are not very useful.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
@@ -14,12 +14,14 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH
 if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON
 then
 	# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
-	is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
+	is_IS_locale=$(locale -a 2>/dev/null |
+		sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
 		p
 		q
 	}')
 	# is_IS.ISO8859-1 on Solaris and FreeBSD, is_IS.iso88591 on Debian
-	is_IS_iso_locale=$(locale -a | sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{
+	is_IS_iso_locale=$(locale -a 2>/dev/null |
+		sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{
 		p
 		q
 	}')

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH`
`14`	`14`	`if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON`
`15`	`15`	`then`
`16`	`16`	`# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian`
`17`		`- is_IS_locale=$(locale -a \| sed -n '/^is_IS\.[uU][tT][fF]-*8$/{`
	`17`	`+ is_IS_locale=$(locale -a 2>/dev/null \|`
	`18`	`+ sed -n '/^is_IS\.[uU][tT][fF]-*8$/{`
`18`	`19`	`p`
`19`	`20`	`q`
`20`	`21`	`}')`
`21`	`22`	`# is_IS.ISO8859-1 on Solaris and FreeBSD, is_IS.iso88591 on Debian`
`22`		`- is_IS_iso_locale=$(locale -a \| sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{`
	`23`	`+ is_IS_iso_locale=$(locale -a 2>/dev/null \|`
	`24`	`+ sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{`
`23`	`25`	`p`
`24`	`26`	`q`
`25`	`27`	`}')`