[Cvs-cvs] ccvs/src ChangeLog sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/02/13 21:52:01

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3343&tr2=1.3344&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1109&tr2=1.1110&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3343 ccvs/src/ChangeLog:1.3344
--- ccvs/src/ChangeLog:1.3343   Thu Feb  2 16:59:17 2006
+++ ccvs/src/ChangeLog  Mon Feb 13 21:52:00 2006
@@ -1,3 +1,7 @@
+2006-02-13  Derek Price  <address@hidden>
+
+       * sanity.sh (sshstdio-6): Rewrite using more portable sed script.
+
 2006-02-02  Derek Price  <address@hidden>
 
        * sanity.sh (sshstdio): Attempt to ignore spurious SSH output.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1109 ccvs/src/sanity.sh:1.1110
--- ccvs/src/sanity.sh:1.1109   Thu Feb  2 16:59:18 2006
+++ ccvs/src/sanity.sh  Mon Feb 13 21:52:01 2006
@@ -23609,13 +23609,19 @@
            $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \
              aaa \
           |sed -e \
-'/^Write failed flushing stdout buffer\.
\?$/d;
- /^write stdout: Broken pipe
\?$/d;
- : retry
- /\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?$/{
+'/^Write failed flushing stdout buffer\.
$/d;
+ /^write stdout: Broken pipe
$/d;
+ :retry;
+ /Write failed flushing stdout buffer\.
$/{
        N;
-       s/\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?\n//;
-       b retry;}' \
+       s/Write failed flushing stdout buffer\.
\n//;
+       b retry;
+}
+ /write stdout: Broken pipe
$/{
+       N;
+       s/write stdout: Broken pipe
\n//;
+       b retry;
+}' \
           > wrapper.dif
   
           $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \