Module Name: src
Committed By: christos
Date: Sat Jan 5 00:27:58 UTC 2019
Modified Files:
src/external/gpl2/xcvs/dist/src: tag.c
Log Message:
When we we fail to remove tags, print an error message since we are going
to be exiting with an error anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/tag.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/tag.c
diff -u src/external/gpl2/xcvs/dist/src/tag.c:1.4 src/external/gpl2/xcvs/dist/src/tag.c:1.5
--- src/external/gpl2/xcvs/dist/src/tag.c:1.4 Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/tag.c Fri Jan 4 19:27:58 2019
@@ -17,7 +17,7 @@
* the modules database, if necessary.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tag.c,v 1.4 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: tag.c,v 1.5 2019/01/05 00:27:58 christos Exp $");
#include "cvs.h"
#include <grp.h>
@@ -1189,7 +1189,7 @@ rtag_delete (RCSNode *rcsfile)
if ((isbranch && !disturb_branch_tags) ||
(!isbranch && disturb_branch_tags))
{
- if (!quiet)
+ if (!really_quiet)
error (0, 0,
"Not removing %s tag `%s' from `%s'%s.",
isbranch ? "branch" : "non-branch",
@@ -1200,7 +1200,7 @@ rtag_delete (RCSNode *rcsfile)
if ((retcode = RCS_deltag(rcsfile, symtag)) != 0)
{
- if (!quiet)
+ if (!really_quiet)
error (0, retcode == -1 ? errno : 0,
"failed to remove tag `%s' from `%s'", symtag,
rcsfile->path);
@@ -1275,7 +1275,7 @@ tag_fileproc (void *callerdat, struct fi
if ((isbranch && !disturb_branch_tags) ||
(!isbranch && disturb_branch_tags))
{
- if (!quiet)
+ if (!really_quiet)
error(0, 0,
"Not removing %s tag `%s' from `%s'%s.",
isbranch ? "branch" : "non-branch",
@@ -1287,7 +1287,7 @@ tag_fileproc (void *callerdat, struct fi
if ((retcode = RCS_deltag (vers->srcfile, symtag)) != 0)
{
- if (!quiet)
+ if (!really_quiet)
error (0, retcode == -1 ? errno : 0,
"failed to remove tag %s from %s", symtag,
vers->srcfile->path);