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
This commit is contained in:
Colin Percival 2018-08-21 15:30:47 +00:00
parent 9d58ffcf21
commit 7ac2ecc0af
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=338141

View File

@ -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