Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEF4B6EEB for ; Thu, 9 Jun 2011 20:44:32 +0000 (UTC) Received: (qmail 39372 invoked by uid 500); 9 Jun 2011 20:44:32 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 39339 invoked by uid 500); 9 Jun 2011 20:44:32 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 39332 invoked by uid 99); 9 Jun 2011 20:44:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 20:44:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2011 20:44:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4269A238890D; Thu, 9 Jun 2011 20:44:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1134067 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt bin/hadoop-config.sh Date: Thu, 09 Jun 2011 20:44:10 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110609204411.4269A238890D@eris.apache.org> Author: omalley Date: Thu Jun 9 20:44:10 2011 New Revision: 1134067 URL: http://svn.apache.org/viewvc?rev=1134067&view=rev Log: HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from trying to use the wrong bin directory. (omalley) Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1134067&r1=1134066&r2=1134067&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Jun 9 20:44:10 2011 @@ -88,6 +88,9 @@ Release 0.20.204.0 - unreleased BUG FIXES + HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from + trying to use the wrong bin directory. (omalley) + HADOOP-7369. Fix permissions in tarball for sbin/* and libexec/* (omalley) HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley) Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh?rev=1134067&r1=1134066&r2=1134067&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Thu Jun 9 20:44:10 2011 @@ -25,10 +25,10 @@ script="$(basename -- "$this")" this="$common_bin/$script" # convert relative path to absolute path -bin=`dirname "$this"` +config_bin=`dirname "$this"` script=`basename "$this"` -bin=`cd "$bin"; pwd` -this="$bin/$script" +config_bin=`cd "$config_bin"; pwd` +this="$config_bin/$script" # the root of the Hadoop installation export HADOOP_PREFIX=`dirname "$this"`/..