aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2018-08-21 15:30:47 +0000
committerColin Percival <cperciva@FreeBSD.org>2018-08-21 15:30:47 +0000
commit7ac2ecc0af868d0d3dafa8e71f0c4272e9497077 (patch)
tree49396daecd716b586edf160b1493779c9f7271d1 /release/Makefile.ec2
parent9d58ffcf21687a3186c5192a985859b1f182186a (diff)
downloadsrc-7ac2ecc0af868d0d3dafa8e71f0c4272e9497077.tar.gz
src-7ac2ecc0af868d0d3dafa8e71f0c4272e9497077.zip
Quieten the svn (or svnlite) commands used to extract information from an
SVN checkout for placement into an EC2 AMI. We only run these if there is a .svn directory; but in the event that SVN was used to check out a tree which is then exported over NFS, we were unnecessarily noisy. Reported by: Andrey Fesenko MFC after: 3 days X-MFC-With: r336420, r336433, r336593, r336621, r336622, r336624, r337394, r337401
Notes
Notes: svn path=/head/; revision=338141
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec24
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 678c15184885..32757f185607 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -17,11 +17,11 @@ SVN_CMD= ${_P}/${_S}
.endif
.if exists(${SRCTOP}/.svn)
. if empty(EC2_SVNBRANCH)
- EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
+ EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} 2>/dev/null | sed -e 's/\^\///'
. export EC2_SVNBRANCH
. endif
. if empty(EC2_SVNREV)
- EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+ EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} 2>/dev/null || true
. export EC2_SVNREV
. endif
.else