=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v retrieving revision 1.35 retrieving revision 1.36 diff -c -r1.35 -r1.36 *** src/usr.bin/cvs/update.c 2005/06/17 08:40:42 1.35 --- src/usr.bin/cvs/update.c 2005/06/30 16:37:29 1.36 *************** *** 1,4 **** ! /* $OpenBSD: update.c,v 1.35 2005/06/17 08:40:42 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: update.c,v 1.36 2005/06/30 16:37:29 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. *************** *** 134,154 **** static int cvs_update_pre_exec(struct cvsroot *root) { ! if ((cvs_cmd_update.cmd_flags & CVS_CMD_PRUNEDIRS) && ! (cvs_sendarg(root, "-P", 0) < 0)) ! return (CVS_EX_PROTO); ! if (Aflag && cvs_sendarg(root, "-A", 0) < 0) ! return (CVS_EX_PROTO); ! if (dflag && cvs_sendarg(root, "-d", 0) < 0) ! return (CVS_EX_PROTO); ! if ((rev != NULL) && ((cvs_sendarg(root, "-r", 0) < 0) || ! (cvs_sendarg(root, rev, 0) < 0))) return (CVS_EX_PROTO); ! if ((date != NULL) && ((cvs_sendarg(root, "-D", 0) < 0) || ! (cvs_sendarg(root, date, 0) < 0))) ! return (CVS_EX_PROTO); return (0); } --- 134,156 ---- static int cvs_update_pre_exec(struct cvsroot *root) { ! if (root->cr_method != CVS_METHOD_LOCAL) { ! if ((cvs_cmd_update.cmd_flags & CVS_CMD_PRUNEDIRS) && ! (cvs_sendarg(root, "-P", 0) < 0)) ! return (CVS_EX_PROTO); ! if (Aflag && cvs_sendarg(root, "-A", 0) < 0) ! return (CVS_EX_PROTO); ! if (dflag && cvs_sendarg(root, "-d", 0) < 0) ! return (CVS_EX_PROTO); ! if ((rev != NULL) && ((cvs_sendarg(root, "-r", 0) < 0) || ! (cvs_sendarg(root, rev, 0) < 0))) return (CVS_EX_PROTO); ! if ((date != NULL) && ((cvs_sendarg(root, "-D", 0) < 0) || ! (cvs_sendarg(root, date, 0) < 0))) ! return (CVS_EX_PROTO); ! } return (0); }