svn commit: r1238997 - in /hadoop/common/branches/branch-1.0: CHANGES.txt bin/hadoop-config.sh

[ma...@apache.org]

Author: mattf
Date: Wed Feb  1 08:20:38 2012
New Revision: 1238997

URL: http://svn.apache.org/viewvc?rev=1238997&view=rev
Log:
HADOOP-8010. hadoop-config.sh errors when HADOOP_HOME_WARN_SUPPRESS is set to true and HADOOP_HOME is present. Contributed by Roman Shaposhnik.

Modified:
    hadoop/common/branches/branch-1.0/CHANGES.txt
    hadoop/common/branches/branch-1.0/bin/hadoop-config.sh

Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1238997&r1=1238996&r2=1238997&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Wed Feb  1 08:20:38 2012
@@ -21,6 +21,9 @@ Release 1.0.1 - 2012.01.30
     HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization.
     (Daryn Sharp via suresh)
 
+    HADOOP-8010. hadoop-config.sh errors when HADOOP_HOME_WARN_SUPPRESS is set 
+    to true and HADOOP_HOME is present. (Roman Shaposhnik via mattf)
+
 Release 1.0.0 - 2011.12.15
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-1.0/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/bin/hadoop-config.sh?rev=1238997&r1=1238996&r2=1238997&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/bin/hadoop-config.sh (original)
+++ hadoop/common/branches/branch-1.0/bin/hadoop-config.sh Wed Feb  1 08:20:38 2012
@@ -70,7 +70,7 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.s
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME_WARN_SUPPRESS" = "" ] && [ "$HADOOP_HOME" != "" ]; then
   echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
   echo 1>&2
 fi