Author: jlowe
Date: Mon Jun 10 18:14:16 2013
New Revision: 1491549
URL: http://svn.apache.org/r1491549
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-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491549&r1=1491548&r2=1491549&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Jun 10 18:14:16 2013
@@ -246,6 +246,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+ HADOOP-9581. hadoop --config non-existent directory should result in error
+ (Ashwin Shankar via jlowe)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491549&r1=1491548&r2=1491549&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
Mon Jun 10 18:14:16 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
