diff options
| author | wiz <wiz@pkgsrc.org> | 2004-09-09 22:26:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-09-09 22:26:09 +0000 |
| commit | c7247dff29151ec0070ba681d648287e89e8901c (patch) | |
| tree | f4e015637f663bb1cb1cdc04a913444aacbf0815 /devel | |
| parent | 4e096b8547296dc256964192cf8c8cd91590bd95 (diff) | |
| download | pkgsrc-c7247dff29151ec0070ba681d648287e89e8901c.tar.gz | |
From Ian Lance Taylor <ian@wasabisystems.com>:
* recurse.c (do_recursion): Correct test for calling
server_pause_check to occur when locktype != CVS_LOCK_WRITE.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cvs/patches/patch-aq | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq index 4e0e059a847..2240fc974fd 100644 --- a/devel/cvs/patches/patch-aq +++ b/devel/cvs/patches/patch-aq @@ -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 @@ $NetBSD: patch-aq,v 1.6 2004/04/15 22:28:36 wiz Exp $ /* 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 + |