From owner-svn-src-all@freebsd.org  Tue Jul 17 23:16:05 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E01201029AF5;
 Tue, 17 Jul 2018 23:16:05 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 92DD17DAD8;
 Tue, 17 Jul 2018 23:16:05 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7523312236;
 Tue, 17 Jul 2018 23:16:05 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6HNG52x049862;
 Tue, 17 Jul 2018 23:16:05 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6HNG5pk049861;
 Tue, 17 Jul 2018 23:16:05 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201807172316.w6HNG5pk049861@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 17 Jul 2018 23:16:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336433 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: cperciva
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 336433
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2018 23:16:06 -0000

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}