Check that EC2SNSTOPIC and EC2PUBLIC are non-empty, along with being

defined, in order to avoid problems with thermite.sh.

Reported by:	gjb
This commit is contained in:
Colin Percival 2018-07-17 23:16:05 +00:00
parent 50b1a01ecb
commit 43fbd222cc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336433

View File

@ -8,10 +8,10 @@
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
AMINAMESUFFIX!= date +-%Y-%m-%d AMINAMESUFFIX!= date +-%Y-%m-%d
.endif .endif
.if defined(EC2PUBLIC) .if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
PUBLISH= --public PUBLISH= --public
.endif .endif
.if defined(EC2SNSTOPIC) .if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH} EC2SNSREL= ${REVISION}-${BRANCH}
EC2_SVNBRANCH!= svn info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' EC2_SVNBRANCH!= svn info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
EC2_SVNREV!= svn info --show-item last-changed-revision ${WORLDDIR} EC2_SVNREV!= svn info --show-item last-changed-revision ${WORLDDIR}