[kudu] branch master updated: thirdparty: fix build_curl some more

[ad...@apache.org]

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

adar 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 53ea7c6  thirdparty: fix build_curl some more
53ea7c6 is described below

commit 53ea7c648d8908e8587412757093777945b68369
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Tue Jun 11 20:37:27 2019 -0700

    thirdparty: fix build_curl some more
    
    As written, the function would misbehave if krb5-config wasn't found at all.
    
    Change-Id: Ic70880b7a361ce9768748a0e3c6afaf0b8dc3ca0
    Reviewed-on: http://gerrit.cloudera.org:8080/13593
    Reviewed-by: Grant Henke <gr...@apache.org>
    Tested-by: Kudu Jenkins
---
 thirdparty/build-definitions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index d156dab..ff29e67 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -661,8 +661,8 @@ build_curl() {
   # pass the right location via the KRB5CONFIG environment variable.
   #
   # TODO(adar): there's gotta be a way to do this without using export/unset.
-  KRB5CONFIG_LOCATION=$(which krb5-config)
-  if [ "$KRB5CONFIG_LOCATION" != "/usr/bin/krb5-config" ]; then
+  KRB5CONFIG_LOCATION=$(which krb5-config 2>/dev/null || :)
+  if [ -n "$KRB5CONFIG_LOCATION" -a "$KRB5CONFIG_LOCATION" != "/usr/bin/krb5-config" ]; then
     export KRB5CONFIG=$KRB5CONFIG_LOCATION
   fi