svn commit: r338141 - head/release

[Colin Percival]

Author: cperciva
Date: Tue Aug 21 15:30:47 2018
New Revision: 338141
URL: https://svnweb.freebsd.org/changeset/base/338141

Log:
  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

Modified:
  head/release/Makefile.ec2

Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2	Tue Aug 21 15:11:43 2018	(r338140)
+++ head/release/Makefile.ec2	Tue Aug 21 15:30:47 2018	(r338141)
@@ -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