Date: Tue, 17 Jul 2018 23:16:05 +0000 (UTC) From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336433 - head/release Message-ID: <201807172316.w6HNG5pk049861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807172316.w6HNG5pk049861>