[csw-devel] SF.net SVN: gar:[14495] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 14495
          http://gar.svn.sourceforge.net/gar/?rev=14495&view=rev
Author:   bdwalton
Date:     2011-05-03 03:01:03 +0000 (Tue, 03 May 2011)

Log Message:
-----------
git/trunk: patch around some utf8 testing in git-svn test suite

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2011-05-03 00:02:28 UTC (rev 14494)
+++ csw/mgar/pkg/git/trunk/Makefile	2011-05-03 03:01:03 UTC (rev 14495)
@@ -99,6 +99,9 @@
 PATCHFILES += 0003-Update-path-in-sample-hook-file.patch
 PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+# this patch is required on current9s (not necessarily all sparc boxes) due
+# to the selection of available utf8 locales.
+PATCHFILES_isa-sparcv8 += 0006-Force-en_US.UTF-8-for-a-git-svn-test.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-Force-en_US.UTF-8-for-a-git-svn-test.patch	2011-05-03 03:01:03 UTC (rev 14495)
@@ -0,0 +1,32 @@
+From f2a93f88203f1c1331d7e06c46ac4066d0eef2bc Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 3 May 2011 04:50:15 +0200
+Subject: [PATCH] Force en_US.UTF-8 for a git-svn test
+
+This test fails when the UTF8 detection picks fr.UTF-8.  Force it's hand
+in this matter.  This patch should only be applied on current9s for now.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t9129-git-svn-i18n-commitencoding.sh |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
+index 8cfdfe7..dd570b6 100755
+--- a/t/t9129-git-svn-i18n-commitencoding.sh
++++ b/t/t9129-git-svn-i18n-commitencoding.sh
+@@ -14,10 +14,7 @@ compare_git_head_with () {
+ 	test_cmp current "$1"
+ }
+ 
+-a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
+-	p
+-	q
+-}')
++a_utf8_locale=en_US.UTF-8
+ 
+ if test -n "$a_utf8_locale"
+ then
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.