When using backup_uses_rcs=YES in backup_file(), after checking the file

in and setting -kb, check it out again, since the initial check in
trashes any RCSIDs (because -kb wasn't set at that time).

This stops the annoying situation where you add a new file (e.g, "foo")
which contains an RCSID and you get *two* notifications of differences
in two successives runs of /etc/security; the first when the file is
initially checked in and a second when diff finds the RCSID is different
(contains "foo.conf,v 1.1" instead of "foo,v 1.66").
This commit is contained in:
lukem 2002-05-21 12:31:01 +00:00
parent 765dc83a3e
commit a40243df30
1 changed files with 3 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: rc.subr,v 1.48 2002/04/18 07:18:05 lukem Exp $
# $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@ -819,6 +819,7 @@ backup_file()
if [ ! -f $_cur,v -o $_cur -nt $_cur,v ]; then
ci -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
rcs -q -kb -U $_cur
co -q -f -u $_cur
fi
fi
@ -827,6 +828,7 @@ backup_file()
cp -p $_file $_cur
ci -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
rcs -q -kb -U $_cur
co -q -f -u $_cur
chown root:wheel $_cur $_cur,v
;;
remove)