From owner-freebsd-hackers Sun Mar 23 3: 6:42 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD62937B404 for ; Sun, 23 Mar 2003 03:06:24 -0800 (PST) Received: from smtp.inode.at (smtp-01.inode.at [62.99.194.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C30143FD7 for ; Sun, 23 Mar 2003 03:06:22 -0800 (PST) (envelope-from mranner@dwarf.jawa.at) Received: from line-h-153.adsl-dynamic.inode.at ([81.223.1.153]:1194 helo=dwarf.jawa.at) by smtp.inode.at with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.10) id 18x3Iv-0001WG-00; Sun, 23 Mar 2003 12:06:18 +0100 Received: from dwarf.jawa.at (localhost.jawa.at [127.0.0.1]) by dwarf.jawa.at (8.12.6/8.12.6) with ESMTP id h2NB67mC001761; Sun, 23 Mar 2003 12:06:07 +0100 (CET) (envelope-from mranner@dwarf.jawa.at) Received: by dwarf.jawa.at (8.12.6/8.12.6/Submit) id h2NB66jm001760; Sun, 23 Mar 2003 12:06:06 +0100 (CET) From: Michael Ranner To: freebsd-hackers@freebsd.org Subject: Re: generalized mergemaster(8) Date: Sun, 23 Mar 2003 12:06:06 +0100 User-Agent: KMail/1.5 References: <20030321041548.GY25577@geekpunk.net> <3E7B56B9.6050005@acm.org> In-Reply-To: MIME-Version: 1.0 Content-Disposition: inline Cc: Garance A Drosihn Content-Type: Multipart/Mixed; boundary="Boundary-00=_eUZf+bj/Sm49djI" Message-Id: <200303231206.06445.mranner@inode.at> Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --Boundary-00=_eUZf+bj/Sm49djI Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Content-Disposition: inline Am Freitag, 21. März 2003 20:27 schrieb Garance A Drosihn: > > > > /var/tmp/temproot/etc/rc.d/ and /etc/rc.d/ have 17 differing files. > > (I)nstall, (D)elete, or (R)ecursively examine? [R] > > > >Then I could hit 'I' and update all of /etc/rc.d at once. > > At times I've asked Doug about some kind of pattern-support in > ~/.mergemasterrc, where the user could specify filename-patterns > of files where they want the default action to be "install" > instead of "leave for later". There are pros and cons with that > idea, but that's what I was thinking of for the directories you > describe. > > Doug has suggested that people could maybe do things with the > MM_PRE_COMPARE_SCRIPT, for special processing like this. I have a small patch for pattern-support in ~/.mergemasterrc and already sent my ideas to Doug, but he said "It could/should be done with MM_PRE_COMPARE_SCRIPT" to me. Regards -- /\/\ichael Ranner mranner@jawa.at - mranner@bitonline.cc - webmaster@mariazell.at ---------------------------------------------------------------------- JAWA Management Software GmbH - http://www.jawa.at/ Liebenauer Hauptstrasse 2oo - A-8041 Graz Tel +43 316 403274 21 - Fax +43 316 403274 10 ---------------------------------------------------------------------- Mariazell Online - http://www.mariazell.at/ ---------------------------------------------------------------------- -----BEGIN GEEK CODE BLOCK----- GIT/CS/AT dx(-) s+:(++:) a- C++ UBLVS++++$ P++>+++$ L-(+)$ E--- W+++$ N+(++) o-- K- w--()$ O-(--) M@ V-(--) PS+>++ PE(-) Y+ PGP(-) t+ 5+ X+++(++++) R* tv++ b+(++) DI++ D-(--) G- e h--(*) r++ y? ------END GEEK CODE BLOCK------ --Boundary-00=_eUZf+bj/Sm49djI Content-Type: text/x-diff; charset="iso-8859-1"; name="mergemaster.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mergemaster.patch" *** mergemaster.orig Wed Mar 5 16:35:54 2003 --- mergemaster Thu Mar 6 15:47:38 2003 *************** *** 106,115 **** diff_loop () { HANDLE_COMPFILE=v while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ "${HANDLE_COMPFILE}" = "NOT V" ]; do ! if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then echo '' echo ' ====================================================================== ' --- 106,133 ---- diff_loop () { HANDLE_COMPFILE=v + AUTO_INSTALL_FILE=n + + case "${AUTO_INSTALL}" in + [Yy][Ee][Ss]) + set -f + for each in $AUTO_INSTALL_FILES + do + if expr "$COMPFILE" : ".$each\$" >/dev/null; then + AUTO_INSTALL_FILE=y + break + fi + done + set +f + ;; + *) + ;; + esac while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ "${HANDLE_COMPFILE}" = "NOT V" ]; do ! if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" -a \ ! "$AUTO_INSTALL_FILE" = "n" ]; then if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then echo '' echo ' ====================================================================== ' *************** *** 124,130 **** fi else echo '' ! echo " *** There is no installed version of ${COMPFILE}" echo '' case "${AUTO_INSTALL}" in [Yy][Ee][Ss]) --- 142,152 ---- fi else echo '' ! if [ "$AUTO_INSTALL_FILE" = "y" ]; then ! echo " *** Automatic installation of ${COMPFILE}" ! else ! echo " *** There is no installed version of ${COMPFILE}" ! fi echo '' case "${AUTO_INSTALL}" in [Yy][Ee][Ss]) --Boundary-00=_eUZf+bj/Sm49djI Content-Type: text/plain; charset="iso-8859-1"; name="mergemaster.rc" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mergemaster.rc" AUTO_INSTALL_FILES="/etc/periodic/.*" --Boundary-00=_eUZf+bj/Sm49djI-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message