Date: Wed, 13 Jun 2001 23:14:58 -0400 From: James <James_Bond_79@yahoo.com> To: dougb@freebsd.org Cc: freebsd-hackers@freebsd.org Subject: mergmaster bug Message-ID: <01061323145802.00417@Halstead007>
next in thread | raw e-mail | index | archive | help
Just noticed a small bug in mergemaster:
When using specifying the destdir with -D and in verbose mode, mergemaster
will not properly display the list of files that are only in ${DESTDIR}/etc,
because the diff has /etc hardcoded. See the diff below.
While on the mergemaster topic, I have seen discussion in the past about
using md5 to see if the live /etc files have been modified since installed
the last time mergemaster was run, and just installing new versions if the
local have not been modified. Has anything been done with this?
James
--- mergemaster.sh.orig Wed Jun 13 20:08:01 2001
+++ mergemaster.sh Wed Jun 13 21:09:54 2001
@@ -471,7 +471,7 @@
echo ' *** Press [Enter] or [Return] key to continue'
read ANY_KEY
unset ANY_KEY
- diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
+ diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc"
|
${PAGER}
echo ''
echo ' *** Press [Enter] or [Return] key to continue'
read ANY_KEY
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?01061323145802.00417>