summaryrefslogtreecommitdiff
path: root/devel/cvs/patches/patch-aq
blob: 2240fc974fd7bf4f377187917768cb798a9d61d3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
$NetBSD: patch-aq,v 1.7 2004/09/09 22:26:09 wiz Exp $

--- 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)
 	return (0);
 
-    locktype = noexec ? CVS_LOCK_NONE : frame->locktype;
+    locktype = nolock ? CVS_LOCK_NONE : frame->locktype;
 
     /* 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