From 87faf663183535257e6a36e68c7d3c607ac004f9 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Sun, 22 Jul 2018 22:57:52 +0000 Subject: [PATCH] fix build non-svn checkouts post r336593 The change made in r336593 assumes that the build is happening in a svn checkout resulting in misleading debug output. Check that we're actually working in an svn checkout before proceeding to call svn. --- release/Makefile.ec2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index eedd0217ba9b..1a18229a7b0e 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -15,8 +15,13 @@ SVN_CMD= ${_P}/${_S} . endfor . endfor .endif +.if exists($SRCTOP/.svn) EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} +.else +EC2_SVNBRANCH= unknown +EC2_SVNREV= unknown +.endif .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" AMINAMESUFFIX!= date +-%Y-%m-%d