Attachment 34194 Details for Bug 55634 – patch-mergemaster

patch-mergemaster

patch-mergemaster (text/plain), 1.09 KB, created by glennpj on 2003-08-16 19:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: glennpj

Created: 2003-08-16 19:20:08 UTC

Size: 1.09 KB

patch

obsolete

>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

Actions: View

Attachments on bug 55634: 34194