Attachment 196193 Details for Bug 192577 – auto install if only change is $FreeBSD: ...$ lines.

[patch] auto install if only change is $FreeBSD: ...$ lines.

patch2 (text/plain), 1.22 KB, created by Wall on 2018-08-14 13:15:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wall

Created: 2018-08-14 13:15:31 UTC

Size: 1.22 KB

patch

obsolete

>--- /usr/sbin/mergemaster	2018-08-13 17:21:37.204776000 -0400
>+++ ./mergemaster	2018-08-14 08:57:07.133470000 -0400
>@@ -11,6 +11,7 @@
> # $FreeBSD$
> 
> PATH=/bin:/usr/bin:/usr/sbin
>+DIFF_TMP=/var/tmp/tmp.mergemaster`date +%m%d.%H.%M.%S`
> 
> display_usage () {
>   VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
>@@ -139,6 +140,26 @@ diff_loop () {
>         esac
>       fi
>       if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then
>+	diff -I'^.*\$FreeBSD$: [^$]*$\?\$.*$' ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > ${DIFF_TMP}
>+	if [ ! -s ${DIFF_TMP} ] ; then
>+	  # Only differences are $FreeBSD[: *]$ lines.  Install.
>+	  rm ${DIFF_TMP}
>+	  echo ''
>+	  echo "  *** ${COMPFILE} has not been user modified."
>+	  echo ''
>+
>+	  if mm_install "${COMPFILE}"; then
>+	    echo "   *** ${COMPFILE} upgraded successfully"
>+	    echo ''
>+	    # Make the list print one file per line
>+	    AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES}      ${DESTDIR}${COMPFILE#.}
>+	    "
>+	  else
>+	    echo "   *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
>+	  fi
>+	  return
>+	fi
>+	rm ${DIFF_TMP}
> 	echo ''
> 	echo '   ======================================================================   '
> 	echo ''

Actions: View | Diff

Attachments on bug 192577: 145658 | 196193