svn commit: r255929 - head/include

[Nathan Whitehorn]

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