[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch] |
Date: |
Mon, 13 Feb 2006 21:50:40 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Derek Robert Price <address@hidden> 06/02/13 21:50:39
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh (sshstdio-6): Rewrite using more portable sed script.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.420&tr2=1.2336.2.421&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.185&tr2=1.752.2.186&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.420 ccvs/src/ChangeLog:1.2336.2.421
--- ccvs/src/ChangeLog:1.2336.2.420 Sat Feb 4 17:07:59 2006
+++ ccvs/src/ChangeLog Mon Feb 13 21:50:38 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.752.2.185 ccvs/src/sanity.sh:1.752.2.186
--- ccvs/src/sanity.sh:1.752.2.185 Sat Feb 4 17:07:59 2006
+++ ccvs/src/sanity.sh Mon Feb 13 21:50:38 2006
@@ -21048,13 +21048,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 \