From 03518d5ee1b4c4c569a9bd3aa9628b8ab21474f6 Mon Sep 17 00:00:00 2001 From: cperciva Date: Tue, 21 Aug 2018 15:30:47 +0000 Subject: [PATCH] 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 --- release/Makefile.ec2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 678c1518488..32757f18560 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 -- 2.45.0