From glennpj@charter.net  Sat Aug 16 11:19:49 2003
Return-Path: <glennpj@charter.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C621637B401
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <glennpj@charter.net>
Reply-To: Glenn Johnson <glennpj@charter.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         55634
>Category:       bin
>Synopsis:       Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 16 11:20:08 PDT 2003
>Closed-Date:    Sat May 22 15:38:38 PDT 2004
>Last-Modified:  Sat May 22 15:38:38 PDT 2004
>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:

From: MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org>
To: dougb@FreeBSD.org
Cc: freebsd-gnats-submit@FreeBSD.org, glennpj@charter.net
Subject: Re: bin/55634 Add IGNORE_PRINTCAP option to mergemaster, useful
 for CUPS
Date: Fri, 21 May 2004 15:43:14 +0900 (JST)

 Hi.
 Doug Barton
 
   May I commit below PR for mergemaster?
 
 Add IGNORE_PRINTCAP option to mergemaster, useful for CUPS
 http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/55634
 
 ---
 MIHIRA, Sanpei Yoshiro
 Tokyo, Japan.
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Sat May 22 15:37:07 PDT 2004 
State-Changed-Why:  

The canonical way to handled this type of situation is to create 
an MM_PRE_COMPARE_SCRIPT to handle it, and reference that script 
in your ~/.mergemasterrc. The man page describes how to do that. 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Sat May 22 15:37:07 PDT 2004 
Responsible-Changed-Why:  

I'm the mergemaster maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55634 
>Unformatted:
