merge from next
This commit is contained in:
@@ -902,7 +902,7 @@ chmod u+w "$LOCK_FILE"
|
||||
echo $$ > "$LOCK_FILE"
|
||||
|
||||
# that line makes the script remove the lock file in case of unwanted exit
|
||||
trap "rm -f $LOCK_FILE" EXIT HUP INT TERM
|
||||
trap "rm -f \"$LOCK_FILE\"" EXIT HUP INT TERM
|
||||
|
||||
# Notify test started
|
||||
if [ ! "${MAIL_ADDRESS}" = "must_be_set_in_.autocgalrc" ]; then
|
||||
@@ -948,13 +948,13 @@ if [ -z "${DO_NOT_TEST}" ]; then
|
||||
run_test
|
||||
fi
|
||||
|
||||
cd ${CGAL_ROOT}
|
||||
cd "${CGAL_ROOT}"
|
||||
|
||||
if [ -e "LATEST" ]; then
|
||||
mv LATEST RELEASE_NR
|
||||
fi
|
||||
|
||||
rm -f $LOCK_FILE;
|
||||
rm -f "$LOCK_FILE";
|
||||
|
||||
# EOF
|
||||
|
||||
|
||||
@@ -241,7 +241,7 @@ if [ -n "$DO_TAG" ]; then
|
||||
if [ -n "$NO_TESTSUITE" ]; then
|
||||
TAG_MSG_EXTRA=" (no testsuite)"
|
||||
fi
|
||||
svn cp -m "Internal release tag for $release_name$TAG_MSG_EXTRA" ${SOURCES_DIR} $SVNCGAL/tags/internal-releases/$release_name
|
||||
svn cp -m "Internal release tag for $release_name$TAG_MSG_EXTRA (automated commit)" ${SOURCES_DIR} $SVNCGAL/tags/internal-releases/$release_name
|
||||
fi
|
||||
|
||||
# Build the SRPM
|
||||
|
||||
Reference in New Issue
Block a user