Date: Wed, 30 Dec 2009 23:14:03 +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: <200912302314.nBUNESil056371@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-12-30 23:14:03 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
SVN rev 201291 on 2009-12-30 23:14:03Z by dougb
Add some patches contributed by jhb:
1. Don't prompt the user for "-U but no db" error if we're using -a
2. Add an option to delete stale rc.d files automatically if the user
has DELETE_STALE_RC_FILES in their rc file. Lack of command line option
for this is not an oversight.
3. Add []'s around the terminal $ for the $FreeBSD$ test for -F
For one bug raised by jhb I did a more thorough solution:
There were a lot of things that "snuck in" between the end of the test
for -r and the start of the comparison. One of them is the creation of
the mtree db, as pointed out by jhb. Fix this problem more thoroughly
by moving the end of the test down to where it should/used to be, right
before the comparison. As a result, indent the interloping code to match.
Revision Changes Path
1.78 +36 -25 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912302314.nBUNESil056371>