diff options
| author |   tobias <tobias@openbsd.org> | 2007-09-19 12:48:41 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2007-09-19 12:48:41 +0000 |
| commit | a2bdf3e310cfa50dec83223c81e500d19617bcea (patch) | |
| tree | 4254eacd70ef739ed24300ac061c6356debbddc4 /usr.bin/cvs | |
| parent | attach CFA 635 as a uftdi. (diff) | |
| download | wireguard-openbsd-a2bdf3e310cfa50dec83223c81e500d19617bcea.tar.xz wireguard-openbsd-a2bdf3e310cfa50dec83223c81e500d19617bcea.zip | |
Print warning about invalid command in .cvsrc only if -V is in use.
OpenCVS defaults to -q, so man page should say "with -V", not "without -q
or -Q".
OK joris@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/cvs.5 | 12 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.c | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/usr.bin/cvs/cvs.5 b/usr.bin/cvs/cvs.5 index 56b95773a9e..f41a2f1cabd 100644 --- a/usr.bin/cvs/cvs.5 +++ b/usr.bin/cvs/cvs.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.5,v 1.2 2007/05/31 19:20:09 jmc Exp $ +.\" $OpenBSD: cvs.5,v 1.3 2007/09/19 12:48:41 tobias Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004-2007 Xavier Santolaria <xsa@openbsd.org> @@ -24,7 +24,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: September 19 2007 $ .Dt CVS 5 .Os .Sh NAME @@ -386,12 +386,10 @@ will be added implicitly to the appropriate command's argument vector if it is run. Lines whose .Ar command -argument is not a valid command will generate a warning when running without +argument is not a valid command will generate a warning when running with the -.Fl q -or -.Fl Q -flags. +.Fl V +flag. .Pp Empty lines and lines specifying no optional arguments are ignored. A line beginning with a hash character diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index a80ed2036bb..92ab1f824cd 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.135 2007/09/19 12:26:16 tobias Exp $ */ +/* $OpenBSD: cvs.c,v 1.136 2007/09/19 12:48:41 tobias Exp $ */ /* * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -465,9 +465,10 @@ cvs_read_rcfile(void) lp++; cmdp = cvs_findcmd(p); if (cmdp == NULL) { - cvs_log(LP_NOTICE, - "unknown command `%s' in `%s:%d'", - p, rcpath, linenum); + if (verbosity == 2) + cvs_log(LP_NOTICE, + "unknown command `%s' in `%s:%d'", + p, rcpath, linenum); continue; } |