summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2008-02-23 13:07:44 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2008-02-23 13:07:44 +0000
commit0e3fb4343d59baffdfe76de5436a1b2396a23710 (patch)
tree93566e289d25dd636885b59a964fbcf3919d3b29 /usr.bin/cvs
parent0bce5ef28f8fbdffa3fe2a36b34589f15602ed56 (diff)
Handle global -Q; Avoid interactive stuff when specified.
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/release.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c
index fb02dbd86cb..f15c406ffa3 100644
--- a/usr.bin/cvs/release.c
+++ b/usr.bin/cvs/release.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: release.c,v 1.38 2008/01/31 10:15:05 tobias Exp $ */
+/* $OpenBSD: release.c,v 1.39 2008/02/23 13:07:43 xsa Exp $ */
/*-
* Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org>
*
@@ -129,6 +129,10 @@ cvs_release_local(struct cvs_file *cf)
}
}
+ /* Skip the interactive part if -Q is specified. */
+ if (verbosity == 0)
+ goto delete;
+
saved_noexec = cvs_noexec;
cvs_noexec = 1;
@@ -166,6 +170,7 @@ cvs_release_local(struct cvs_file *cf)
/* change back to original working dir */
cvs_chdir(wdir, 0);
+delete:
if (dflag == 1) {
if (cvs_rmdir(cf->file_path) != 0)
fatal("cvs_release_local: cvs_rmdir failed");