diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2018-07-17 23:16:05 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2018-07-17 23:16:05 +0000 |
| commit | 43fbd222ccdb5a5b8ac862ae89bc1abbae7094a0 (patch) | |
| tree | 01507f5cad0e2fa10a638468a7a58a9c7266fd1b /release/Makefile.ec2 | |
| parent | 50b1a01ecbcbb7439d65234861f434d12f69453f (diff) | |
| download | src-43fbd222ccdb5a5b8ac862ae89bc1abbae7094a0.tar.gz src-43fbd222ccdb5a5b8ac862ae89bc1abbae7094a0.zip | |
Check that EC2SNSTOPIC and EC2PUBLIC are non-empty, along with being
defined, in order to avoid problems with thermite.sh.
Reported by: gjb
Notes
Notes:
svn path=/head/; revision=336433
Diffstat (limited to 'release/Makefile.ec2')
| -rw-r--r-- | release/Makefile.ec2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 329b345c1f37..d392adda78b2 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -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} |