[kudu] branch master updated: thirdparty: fix build-if-necessary in tarballs pt 2

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new dcb8c39  thirdparty: fix build-if-necessary in tarballs pt 2
dcb8c39 is described below

commit dcb8c394d968ee4b25baea0c2cc0e35a17c263d9
Author: Andrew Wong <aw...@apache.org>
AuthorDate: Tue Jun 25 15:04:21 2019 -0700

    thirdparty: fix build-if-necessary in tarballs pt 2
    
    This is a follow-up to 428d175 to use `find` instead of `grep` since
    `grep` returns an exit code of 1 when the results set is empty.
    
    Without this, I couldn't build 1.10.0 RC2 since build-if-necessary.sh
    would exit with 1.
    
    Change-Id: Ic8ffbd69c3622669b73500efaacd4f4e21cfa77a
    Reviewed-on: http://gerrit.cloudera.org:8080/13729
    Reviewed-by: Todd Lipcon <to...@apache.org>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 thirdparty/build-if-necessary.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/thirdparty/build-if-necessary.sh b/thirdparty/build-if-necessary.sh
index c208979..6e2a16c 100755
--- a/thirdparty/build-if-necessary.sh
+++ b/thirdparty/build-if-necessary.sh
@@ -85,10 +85,7 @@ else
   for GROUP in $DEPENDENCY_GROUPS; do
     STAMP_FILE=.build-stamp.$GROUP
     if [ -f $STAMP_FILE ]; then
-      CHANGED_FILE_COUNT=$(find . -cnewer $STAMP_FILE |
-        grep -v '^\./\.build-stamp' |
-        grep -v '^\.$' |
-        wc -l)
+      CHANGED_FILE_COUNT=$(find . -cnewer $STAMP_FILE -not -name '.build-stamp*' -not -name '.' | wc -l)
       echo "$CHANGED_FILE_COUNT file(s) been modified since thirdparty dependency group '$GROUP' was last built."
       if [ $CHANGED_FILE_COUNT -gt 0 ]; then
         echo "Rebuilding."