Date: Fri, 19 Jun 2009 07:33:43 +0200 From: John Hay <jhay@meraka.org.za> To: Doug Barton <dougb@FreeBSD.org> Cc: hackers@freebsd.org Subject: Re: svn commit: r193635 - head/etc Message-ID: <20090619053343.GA1374@zibbi.meraka.csir.co.za> In-Reply-To: <4A3B1AD9.90507@FreeBSD.org> References: <200906071326.n57DQvSG095104@svn.freebsd.org> <86iqiudm63.fsf@ds4.des.no> <4A3A88BD.5030703@FreeBSD.org> <86ab455gop.fsf@ds4.des.no> <4A3B1AD9.90507@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Jun 18, 2009 at 09:58:01PM -0700, Doug Barton wrote: > Dag-Erling Sm??rgrav wrote: > > Doug Barton <dougb@FreeBSD.org> writes: > >> Dag-Erling Sm??rgrav <des@des.no> writes: > >>> Great, now mergemaster blew away my ntp.conf and installed this one > >>> instead. Apparently, it thinks AUTO_UPGRADE means it's fine to > >>> overwrite an existing file with a new one... > >> Yes, that's exactly what the option means. The problem comes in > >> because it's a new file, which means that there is no record of it in > >> the mtree file, so it does not show up as "changed." > > > > Hmm, I'm not sure I follow, since I'm not familiar with the innards of > > mergemaster, > > The -U option works by comparing the installed files to the mtree file > created from the unmodified source files. If the file is listed as > having been changed, the -U option ignores it. If not, it > auto-installs it. Is it not possible to change the logic of -U a little. Only auto install if it is in mtree and has not changed. So if it has changed or is not in mtree, skip the auto install. John -- John Hay -- jhay@meraka.csir.co.za / jhay@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090619053343.GA1374>