Date: Sat, 19 Dec 2009 05:20:26 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200912190520.nBJ5Kmxr027082@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-12-19 05:20:26 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
SVN rev 200708 on 2009-12-19 05:20:26Z by dougb
Fix a problem with how mergemaster handles the hard links for /.cshrc
and /.profile. The problem is that install(1) will unlink the old file
before it installs the new one, which means that in the best case we
have to compare the changes for the old file twice.
So, change the logic to first test to see if the link exists, then
install the file. Then if the link was there and we're using -i, just
create the link in /root and be done with it. Otherwise display the
message to the user and give them the option.
Because we are now sorting things before doing the comparison we can
know conclusively that the files in / should be the sources, and the
files in /root will be the targets, so adjust the paths accordingly.
While I'm here, split a too-long error message into two lines and
just return at the end of handling these files instead of setting
the variable that says "do nothing" and then returning at the end
of the function anyway.
Revision Changes Path
1.77 +20 -13 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912190520.nBJ5Kmxr027082>