summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/ci.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-12-02 13:53:44 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-12-02 13:53:44 +0000
commitd7da0638dbfb634fa6910e5201f4f62c6911d855 (patch)
tree31a81f5ad891fd9112bd7805a16fa6205100e34e /usr.bin/rcs/ci.c
parente8bf50d69c26a986004842ac85136f9553ec8dc6 (diff)
better..
Diffstat (limited to 'usr.bin/rcs/ci.c')
-rw-r--r--usr.bin/rcs/ci.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 768307676f5..42d1e7690ca 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.77 2005/12/02 13:43:32 xsa Exp $ */
+/* $OpenBSD: ci.c,v 1.78 2005/12/02 13:53:43 xsa Exp $ */
/*
* Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -452,11 +452,8 @@ checkin_update(struct checkin_params *pb)
return (-1);
}
- if (checkin_checklock(pb) < 0) {
- cvs_log(LP_ERR, "%s: no lock set by %s",
- pb->file->rf_path, pb->username);
+ if (checkin_checklock(pb) < 0)
return (-1);
- }
/* Load file contents */
if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
@@ -715,7 +712,8 @@ checkin_checklock(struct checkin_params *pb)
}
if ((found == 0) && (notlocked == 0)) {
- cvs_log(LP_ERR, "no locks set for '%s'", pb->username);
+ cvs_log(LP_ERR,
+ "%s: no lock by %s", pb->file->rf_path, pb->username);
rcs_close(pb->file);
return (-1);
}