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 098F84CC9 for ; Mon, 6 Jun 2011 20:58:38 +0000 (UTC) Received: (qmail 55272 invoked by uid 500); 6 Jun 2011 20:58:37 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 55241 invoked by uid 500); 6 Jun 2011 20:58:37 -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 55234 invoked by uid 99); 6 Jun 2011 20:58:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 20:58:37 +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 20:58:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB5182388903; Mon, 6 Jun 2011 20:58:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1132769 - in /hadoop/common/trunk: CHANGES.txt bin/hadoop Date: Mon, 06 Jun 2011 20:58:14 -0000 To: common-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110606205814.BB5182388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Mon Jun 6 20:58:14 2011 New Revision: 1132769 URL: http://svn.apache.org/viewvc?rev=1132769&view=rev Log: HADOOP-7325. The hadoop command should not accept class names starting with a hyphen. Contributed by Brock Noland. Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/bin/hadoop Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1132769&r1=1132768&r2=1132769&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Mon Jun 6 20:58:14 2011 @@ -532,6 +532,9 @@ Release 0.22.0 - Unreleased HADOOP-7335. Force entropy to come from non-true random for tests. (todd via eli) + HADOOP-7325. The hadoop command should not accept class names starting with + a hyphen. (Brock Noland via todd) + OPTIMIZATIONS HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..). Modified: hadoop/common/trunk/bin/hadoop URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop?rev=1132769&r1=1132768&r2=1132769&view=diff ============================================================================== --- hadoop/common/trunk/bin/hadoop (original) +++ hadoop/common/trunk/bin/hadoop Mon Jun 6 20:58:14 2011 @@ -109,6 +109,10 @@ case $COMMAND in CLASS=org.apache.hadoop.tools.HadoopArchives CLASSPATH=${CLASSPATH}:${TOOL_PATH} HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS" + elif [[ "$COMMAND" = -* ]] ; then + # class and package names cannot begin with a - + echo "Error: No command named \`$COMMAND' was found. Perhaps you meant \`hadoop ${COMMAND#-}'" + exit 1 else CLASS=$COMMAND fi