From owner-svn-src-all@FreeBSD.ORG  Sat Sep 28 16:25:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5333084A;
 Sat, 28 Sep 2013 16:25:21 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4069A2495;
 Sat, 28 Sep 2013 16:25:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8SGPLIg090376;
 Sat, 28 Sep 2013 16:25:21 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8SGPLKT090375;
 Sat, 28 Sep 2013 16:25:21 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201309281625.r8SGPLKT090375@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 28 Sep 2013 16:25:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255929 - head/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Sep 2013 16:25:21 -0000

Author: nwhitehorn
Date: Sat Sep 28 16:25:20 2013
New Revision: 255929
URL: http://svnweb.freebsd.org/changeset/base/255929

Log:
  Prevent the set -e from mk-osreldate.sh from propagating into newvers.sh.
  This would cause detection of old versions of SVN to cause fatal errors
  instead of being caught and handled, which would make the build fail if
  the tree had been checked out with an older version of SVN (e.g. 1.6).
  
  Discussed with:	gjb
  Approved by:	re (marius)

Modified:
  head/include/mk-osreldate.sh

Modified: head/include/mk-osreldate.sh
==============================================================================
--- head/include/mk-osreldate.sh	Sat Sep 28 15:49:36 2013	(r255928)
+++ head/include/mk-osreldate.sh	Sat Sep 28 16:25:20 2013	(r255929)
@@ -36,7 +36,9 @@ trap "rm -f $tmpfile" EXIT
 ${ECHO} creating osreldate.h from newvers.sh
 
 export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
-. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
+set +e
+. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1
+set -e
 cat > $tmpfile <<EOF
 $COPYRIGHT
 #ifdef _KERNEL