From 76fc3e6b8cc292f2edc72be38e42c5f7966e1ec0 Mon Sep 17 00:00:00 2001
From: nwhitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 28 Sep 2013 16:25:20 +0000
Subject: 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)
---
 include/mk-osreldate.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh
index aa181c3..952353c 100755
--- a/include/mk-osreldate.sh
+++ b/include/mk-osreldate.sh
@@ -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
-- 
cgit v1.1