diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-28 16:25:20 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-28 16:25:20 +0000 |
| commit | 76fc3e6b8cc292f2edc72be38e42c5f7966e1ec0 (patch) | |
| tree | a9d6a31873950cd026cac9a27966e9d020018daa | |
| parent | eb3631100bf76c92971c7d24886264812747a789 (diff) | |
| download | FreeBSD-src-76fc3e6b8cc292f2edc72be38e42c5f7966e1ec0.zip FreeBSD-src-76fc3e6b8cc292f2edc72be38e42c5f7966e1ec0.tar.gz | |
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)
| -rwxr-xr-x | include/mk-osreldate.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |
