Merge change r1202378 for HADOOP-7816 from 0.20.205 branch

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1202379 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -101,6 +101,9 @@ Release 0.20.205.1 - unreleased
     if the override value is same as the final parameter value.
     (Ravi Prakash via szetszwo)
 
+    HADOOP-7816. Allow HADOOP_HOME deprecated warning suppression based 
+    on config specified in hadoop-env.sh (Dave Thompson via suresh)
+
   BUG FIXES
 
     HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh.

bin/hadoop

@@ -50,17 +50,17 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
-  echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
-  echo 1>&2
-fi
-
 if [ -e "$bin"/../libexec/hadoop-config.sh ]; then
   . "$bin"/../libexec/hadoop-config.sh
 else
   . "$bin"/hadoop-config.sh
 fi
 
+if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+  echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
+  echo 1>&2
+fi
+
 cygwin=false
 case "`uname`" in
 CYGWIN*) cygwin=true;;