Author: jlowe Date: Mon Jun 10 18:20:17 2013 New Revision: 1491554 URL: http://svn.apache.org/r1491554 Log: svn merge -c 1491548 FIXES: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491554&r1=1491553&r2=1491554&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 10 18:20:17 2013 @@ -12,6 +12,9 @@ Release 0.23.9 - UNRELEASED BUG FIXES + HADOOP-9581. hadoop --config non-existent directory should result in error + (Ashwin Shankar via jlowe) + Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491554&r1=1491553&r2=1491554&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Jun 10 18:20:17 2013 @@ -60,6 +60,10 @@ then then shift confdir=$1 + if [ ! -d "$confdir" ]; then + echo "Error: Cannot find configuration directory: $confdir" + exit 1 + fi shift HADOOP_CONF_DIR=$confdir fi