[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/02/04 17:08:00

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        Merge changes from trunk.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.419&tr2=1.2336.2.420&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=cvs1-11-x-branch&tr1=1.752.2.184&tr2=1.752.2.185&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.419 ccvs/src/ChangeLog:1.2336.2.420
--- ccvs/src/ChangeLog:1.2336.2.419     Thu Feb  2 13:08:36 2006
+++ ccvs/src/ChangeLog  Sat Feb  4 17:07:59 2006
@@ -1,5 +1,7 @@
 2006-02-02  Derek Price  <address@hidden>
 
+       * sanity.sh (sshstdio): Attempt to ignore spurious SSH output.
+
        * main.c (main), release.c (release), server.c (do_cvs_command): Always
        call the cleanup hooks before exit.
 
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.184 ccvs/src/sanity.sh:1.752.2.185
--- ccvs/src/sanity.sh:1.752.2.184      Wed Nov  9 20:24:48 2005
+++ ccvs/src/sanity.sh  Sat Feb  4 17:07:59 2006
@@ -21046,7 +21046,16 @@
           chmod +x wrapper.sh
           ./wrapper.sh \
            $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \
-             aaa > wrapper.dif
+             aaa \
+          |sed -e \
+'/^Write failed flushing stdout buffer\.
\?$/d;
+ /^write stdout: Broken pipe
\?$/d;
+ : retry
+ /\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?$/{
+       N;
+       s/\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?\n//;
+       b retry;}' \
+          > wrapper.dif
   
           $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \
              aaa > good.dif