[pkgsrc/trunk]: pkgsrc/devel/cvs/patches From Ian Lance Taylor <ian@wasabisys...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70b89415ded9
branches:  trunk
changeset: 480441:70b89415ded9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 09 22:26:09 2004 +0000

description:
>From Ian Lance Taylor <ian%wasabisystems.com@localhost>:
        * recurse.c (do_recursion): Correct test for calling
        server_pause_check to occur when locktype != CVS_LOCK_WRITE.

diffstat:

 devel/cvs/patches/patch-aq |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 87e6a3ebf87c -r 70b89415ded9 devel/cvs/patches/patch-aq
--- a/devel/cvs/patches/patch-aq        Thu Sep 09 22:25:16 2004 +0000
+++ b/devel/cvs/patches/patch-aq        Thu Sep 09 22:26:09 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.6 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-aq,v 1.7 2004/09/09 22:26:09 wiz Exp $
 
---- src/recurse.c.orig Fri Mar 19 23:21:18 2004
+--- src/recurse.c.orig 2004-03-19 23:21:18.000000000 +0100
 +++ src/recurse.c
 @@ -526,7 +526,7 @@ do_recursion (frame)
      if (frame->flags == R_SKIP_ALL)
@@ -11,3 +11,12 @@
  
      /* The fact that locks are not active here is what makes us fail to have
         the
+@@ -566,7 +566,7 @@ do_recursion (frame)
+      * generating data, to give the buffers a chance to drain to the
+      * remote client.  We should not have locks active at this point,
+      * but if there are writelocks around, we cannot pause here.  */
+-    if (server_active && locktype != CVS_LOCK_NONE)
++    if (server_active && locktype != CVS_LOCK_WRITE)
+       server_pause_check();
+ #endif
+