SF.net SVN: gar:[24925] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 24925
          http://sourceforge.net/p/gar/code/24925
Author:   bdwalton
Date:     2015-05-04 08:40:30 +0000 (Mon, 04 May 2015)
Log Message:
-----------
git/trunk: patch around a tr oddity

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-05-04 08:13:40 UTC (rev 24924)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-05-04 08:40:30 UTC (rev 24925)
@@ -98,6 +98,7 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+PATCHFILES += 0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Added: csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Adapt-test-to-account-for-differing-tr-behaviour-on-.patch	2015-05-04 08:40:30 UTC (rev 24925)
@@ -0,0 +1,31 @@
+From 7720e8a3d98ad630b53e649ac4ff0150b73f8abc Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 4 May 2015 09:37:44 +0100
+Subject: [PATCH] Adapt test to account for differing tr behaviour on Solaris
+
+The tr as found in /usr/xpg4/bin fails to strip the [ character as
+used in tr -d "[]". To correct this, prefix the [ with the escape
+sequence so it is interpreted as a character, not the start of a
+special sequence.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t5500-fetch-pack.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
+index 3a9b775..1df340c 100755
+--- a/t/t5500-fetch-pack.sh
++++ b/t/t5500-fetch-pack.sh
+@@ -547,7 +547,7 @@ check_prot_host_port_path () {
+ 		*ssh*)
+ 		pp=ssh
+ 		uah=userandhost
+-		ehost=$(echo $3 | tr -d "[]")
++		ehost=$(echo $3 | tr -d "\[]")
+ 		diagport="Diag: port=$4"
+ 		;;
+ 		*)
+-- 
+2.3.3
+

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