drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sudhe...@apache.org
Subject drill git commit: DRILL-4854: Fix logic error in drill-config.sh
Date Fri, 19 Aug 2016 22:15:51 GMT
Repository: drill
Updated Branches:
  refs/heads/master 57dc9f43b -> 0a62a4621


DRILL-4854: Fix logic error in drill-config.sh

The check of the log directory should use an OR instead of AND.

closes #572


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/0a62a462
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/0a62a462
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/0a62a462

Branch: refs/heads/master
Commit: 0a62a4621f8b43f9eb4c7f58738e5198fefde26b
Parents: 57dc9f4
Author: Paul Rogers <progers@maprtech.com>
Authored: Thu Aug 18 12:39:45 2016 -0700
Committer: Sudheesh Katkam <skatkam@maprtech.com>
Committed: Fri Aug 19 11:19:09 2016 -0700

----------------------------------------------------------------------
 distribution/src/resources/drill-config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/0a62a462/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index bdf3889..387bcdd 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -203,7 +203,7 @@ fi
 if [ -z "$DRILL_LOG_DIR" ]; then
   # Try the optional location
   DRILL_LOG_DIR=/var/log/drill
-  if [[ ! -d "$DRILL_LOG_DIR" && ! -w "$DRILL_LOG_DIR" ]]; then
+  if [[ ! -d "$DRILL_LOG_DIR" || ! -w "$DRILL_LOG_DIR" ]]; then
     # Default to the drill home folder. Create the directory
     # if not present.
 
@@ -215,7 +215,7 @@ fi
 # and be writable.
 
 mkdir -p "$DRILL_LOG_DIR"
-if [[ ! -d "$DRILL_LOG_DIR" && ! -w "$DRILL_LOG_DIR" ]]; then
+if [[ ! -d "$DRILL_LOG_DIR" || ! -w "$DRILL_LOG_DIR" ]]; then
   fatal_error "Log directory does not exist or is not writable: $DRILL_LOG_DIR"
 fi
 


Mime
View raw message