From owner-freebsd-bugs@FreeBSD.ORG Sat Aug 16 11:20:10 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D5AC37B404 for ; Sat, 16 Aug 2003 11:20:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCFE943F93 for ; Sat, 16 Aug 2003 11:20:08 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h7GIK8Up015024 for ; Sat, 16 Aug 2003 11:20:08 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h7GIK8gQ015023; Sat, 16 Aug 2003 11:20:08 -0700 (PDT) Resent-Date: Sat, 16 Aug 2003 11:20:08 -0700 (PDT) Resent-Message-Id: <200308161820.h7GIK8gQ015023@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Glenn Johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C621637B401 for ; Sat, 16 Aug 2003 11:19:49 -0700 (PDT) Received: from remt30.cluster1.charter.net (remt30.cluster1.charter.net [209.225.8.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1D2943FAF for ; Sat, 16 Aug 2003 11:19:48 -0700 (PDT) (envelope-from glennpj@charter.net) Received: from [24.158.214.251] (HELO gforce.johnson.home) by remt30.cluster1.charter.net (CommuniGate Pro SMTP 4.0.6) with ESMTP id 122412003 for FreeBSD-gnats-submit@freebsd.org; Sat, 16 Aug 2003 14:19:48 -0400 Received: from gforce.johnson.home (localhost [127.0.0.1]) by gforce.johnson.home (8.12.9/8.12.9) with ESMTP id h7GIJkLS000988 for ; Sat, 16 Aug 2003 13:19:46 -0500 (CDT) (envelope-from glenn@gforce.johnson.home) Received: (from glenn@localhost) by gforce.johnson.home (8.12.9/8.12.9/Submit) id h7GIJkjg000987; Sat, 16 Aug 2003 13:19:46 -0500 (CDT) (envelope-from glenn) Message-Id: <200308161819.h7GIJkjg000987@gforce.johnson.home> Date: Sat, 16 Aug 2003 13:19:46 -0500 (CDT) From: Glenn Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/55634: Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Glenn Johnson List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2003 18:20:10 -0000 >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: