From owner-svn-src-head@FreeBSD.ORG Fri Jan 15 03:56:48 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CE16B106566B;
Fri, 15 Jan 2010 03:56:48 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id BCBAC8FC0A;
Fri, 15 Jan 2010 03:56:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0F3um2J039157;
Fri, 15 Jan 2010 03:56:48 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0F3um2s039155;
Fri, 15 Jan 2010 03:56:48 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201001150356.o0F3um2s039155@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 15 Jan 2010 03:56:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r202339 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 03:56:48 -0000
Author: dougb
Date: Fri Jan 15 03:56:48 2010
New Revision: 202339
URL: http://svn.freebsd.org/changeset/base/202339
Log:
Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTD
compat shim as advertised. This change should not be MFC'ed.
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Fri Jan 15 03:39:03 2010 (r202338)
+++ head/usr.sbin/mergemaster/mergemaster.sh Fri Jan 15 03:56:48 2010 (r202339)
@@ -651,17 +651,14 @@ case "${RERUN}" in
;;
esac
- # Avoid comparing the motd if the user specifies it in .mergemasterrc
- # Compatibility shim to be removed in FreeBSD 9.x
case "${IGNORE_MOTD}" in
- '') ;;
- *) IGNORE_FILES="${IGNORE_FILES} /etc/motd"
+ *)
echo ''
echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file."
echo " This option is deprecated in favor of the IGNORE_FILES option."
echo " Please update your rc file accordingly."
echo ''
- press_to_continue
+ exit 1
;;
esac