Date: Sat, 16 Aug 2003 13:19:46 -0500 (CDT) From: Glenn Johnson <glennpj@charter.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/55634: Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS Message-ID: <200308161819.h7GIJkjg000987@gforce.johnson.home> Resent-Message-ID: <200308161820.h7GIK8gQ015023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55634 >Category: bin >Synopsis: Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 16 11:20:08 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Glenn Johnson >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD gforce.johnson.home 5.1-CURRENT FreeBSD 5.1-CURRENT #77: Sat Aug 16 12:28:50 CDT 2003 root@gforce.johnson.home:/usr/obj/usr/src/sys/GFORCE i386 >Description: CUPS writes out a new /etc/printcap file when the scheduler is started. There is no version string in the new printcap file for mergemaster to compare with so mergemaster always sees the printcap file as needing to be updated. The attached patch adds an IGNORE_PRINTCAP option to mergemaster. >How-To-Repeat: >Fix: --- patch-mergemaster begins here --- diff -u mergemaster.orig/mergemaster.8 mergemaster/mergemaster.8 --- mergemaster.orig/mergemaster.8 Sat Aug 16 13:09:32 2003 +++ mergemaster/mergemaster.8 Sat Aug 16 13:07:50 2003 @@ -350,6 +350,9 @@ # # Don't compare the old and new motd files #IGNORE_MOTD=yes +# Don't compare the old and new printcap files, useful for CUPS +# installations +#IGNORE_PRINTCAP=yes # # Specify the path to scripts to run before the comparison starts, # and/or after the script has finished its work Only in mergemaster: mergemaster.8.orig diff -u mergemaster.orig/mergemaster.sh mergemaster/mergemaster.sh --- mergemaster.orig/mergemaster.sh Sat Aug 16 13:09:32 2003 +++ mergemaster/mergemaster.sh Sat Aug 16 13:03:43 2003 @@ -555,6 +555,12 @@ *) rm -f ${TEMPROOT}/etc/motd ;; esac + # Avoid comparing the printcap if the user specifies it in .mergemasterrc + case "${IGNORE_PRINTCAP}" in + '') ;; + *) rm -f ${TEMPROOT}/etc/printcap + ;; + esac # Avoid trying to update MAKEDEV if /dev is on a devfs if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then Only in mergemaster: mergemaster.sh.orig --- patch-mergemaster ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308161819.h7GIJkjg000987>