This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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)
  • Loading branch information...
nwhitehorn committed Sep 28, 2013
1 parent eb36311 commit 76fc3e6b8cc292f2edc72be38e42c5f7966e1ec0
Showing with 3 additions and 1 deletion.
  1. +3 −1 include/mk-osreldate.sh
View
@@ -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

0 comments on commit 76fc3e6

Please sign in to comment.