Author: cperciva
Date: Tue Jul 17 23:16:05 2018
New Revision: 336433
URL: https://svnweb.freebsd.org/changeset/base/336433
Log:
Check that EC2SNSTOPIC and EC2PUBLIC are non-empty, along with being
defined, in order to avoid problems with thermite.sh.
Reported by: gjb
Modified:
head/release/Makefile.ec2
Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2 Tue Jul 17 23:00:52 2018 (r336432)
+++ head/release/Makefile.ec2 Tue Jul 17 23:16:05 2018 (r336433)
@@ -8,10 +8,10 @@
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
AMINAMESUFFIX!= date +-%Y-%m-%d
.endif
-.if defined(EC2PUBLIC)
+.if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
PUBLISH= --public
.endif
-.if defined(EC2SNSTOPIC)
+.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
EC2SNSREL= ${REVISION}-${BRANCH}
EC2_SVNBRANCH!= svn info --show-item relative-url ${WORLDDIR} | sed -e
's/\^\///'
EC2_SVNREV!= svn info --show-item last-changed-revision ${WORLDDIR}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
