summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxsa <xsa@openbsd.org>2008-02-23 13:07:43 +0000
committerxsa <xsa@openbsd.org>2008-02-23 13:07:43 +0000
commit21d4a23266f2f5af9688dac41e38d0310ca9b48b (patch)
tree39d7d5c5cfb24b99699a8da1d08ccbc94f7fb377
parentupdate the list of supported wireless devices; (diff)
downloadwireguard-openbsd-21d4a23266f2f5af9688dac41e38d0310ca9b48b.tar.xz
wireguard-openbsd-21d4a23266f2f5af9688dac41e38d0310ca9b48b.zip
Handle global -Q; Avoid interactive stuff when specified.
-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");