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 9A1C44014 for ; Mon, 6 Jun 2011 21:16:04 +0000 (UTC) Received: (qmail 99720 invoked by uid 500); 6 Jun 2011 21:16:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 99693 invoked by uid 500); 6 Jun 2011 21:16:04 -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 99686 invoked by uid 99); 6 Jun 2011 21:16:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 21:16:04 +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; Mon, 06 Jun 2011 21:16:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0B18423888C2; Mon, 6 Jun 2011 21:15:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1132776 - in /hadoop/common/trunk: CHANGES.txt bin/hadoop bin/hadoop-daemon.sh bin/hadoop-daemons.sh bin/slaves.sh bin/start-all.sh bin/stop-all.sh Date: Mon, 06 Jun 2011 21:15:42 -0000 To: common-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110606211543.0B18423888C2@eris.apache.org> Author: todd Date: Mon Jun 6 21:15:42 2011 New Revision: 1132776 URL: http://svn.apache.org/viewvc?rev=1132776&view=rev Log: HADOOP-7356. RPM packages broke bin/hadoop script in developer environment. Contributed by Eric Yang. Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/bin/hadoop hadoop/common/trunk/bin/hadoop-daemon.sh hadoop/common/trunk/bin/hadoop-daemons.sh hadoop/common/trunk/bin/slaves.sh hadoop/common/trunk/bin/start-all.sh hadoop/common/trunk/bin/stop-all.sh Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Mon Jun 6 21:15:42 2011 @@ -283,6 +283,9 @@ Trunk (unreleased changes) HADOOP-7353. Cleanup FsShell and prevent masking of RTE stack traces. (Daryn Sharp via todd) + HADOOP-7356. RPM packages broke bin/hadoop script in developer environment. + (Eric Yang via todd) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/bin/hadoop URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/hadoop (original) +++ hadoop/common/trunk/bin/hadoop Mon Jun 6 21:15:42 2011 @@ -21,7 +21,11 @@ bin=`which $0` bin=`dirname ${bin}` bin=`cd "$bin"; pwd` -. "$bin"/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi function print_usage(){ echo "Usage: hadoop [--config confdir] COMMAND" Modified: hadoop/common/trunk/bin/hadoop-daemon.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemon.sh?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/hadoop-daemon.sh (original) +++ hadoop/common/trunk/bin/hadoop-daemon.sh Mon Jun 6 21:15:42 2011 @@ -39,7 +39,11 @@ fi bin=`dirname "${BASH_SOURCE-$0}"` bin=`cd "$bin"; pwd` -. "$bin"/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi # get arguments Modified: hadoop/common/trunk/bin/hadoop-daemons.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemons.sh?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/hadoop-daemons.sh (original) +++ hadoop/common/trunk/bin/hadoop-daemons.sh Mon Jun 6 21:15:42 2011 @@ -29,6 +29,10 @@ fi bin=`dirname "${BASH_SOURCE-$0}"` bin=`cd "$bin"; pwd` -. $bin/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi exec "$bin/slaves.sh" --config $HADOOP_CONF_DIR cd "$HADOOP_PREFIX" \; "$bin/hadoop-daemon.sh" --config $HADOOP_CONF_DIR "$@" Modified: hadoop/common/trunk/bin/slaves.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/slaves.sh?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/slaves.sh (original) +++ hadoop/common/trunk/bin/slaves.sh Mon Jun 6 21:15:42 2011 @@ -38,7 +38,11 @@ fi bin=`dirname "${BASH_SOURCE-$0}"` bin=`cd "$bin"; pwd` -. "$bin"/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then . "${HADOOP_CONF_DIR}/hadoop-env.sh" Modified: hadoop/common/trunk/bin/start-all.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-all.sh?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/start-all.sh (original) +++ hadoop/common/trunk/bin/start-all.sh Mon Jun 6 21:15:42 2011 @@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead bin=`dirname "${BASH_SOURCE-$0}"` bin=`cd "$bin"; pwd` -. "$bin"/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi # start hdfs daemons if hdfs is present if [ -f "${HADOOP_HDFS_HOME}"/bin/start-dfs.sh ]; then Modified: hadoop/common/trunk/bin/stop-all.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-all.sh?rev=1132776&r1=1132775&r2=1132776&view=diff ============================================================================== --- hadoop/common/trunk/bin/stop-all.sh (original) +++ hadoop/common/trunk/bin/stop-all.sh Mon Jun 6 21:15:42 2011 @@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead bin=`dirname "${BASH_SOURCE-$0}"` bin=`cd "$bin"; pwd` -. "$bin"/../libexec/hadoop-config.sh +if [ -e "$bin/../libexec/hadoop-config.sh" ]; then + . "$bin"/../libexec/hadoop-config.sh +else + . "$bin"/hadoop-config.sh +fi # stop hdfs daemons if hdfs is present if [ -f "${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh ]; then