From d074c686b3ba0ba6843d0a25dca5ac991f919e68 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Fri, 10 Jul 2009 20:26:30 +0000
Subject: [PATCH] HADOOP-6139. Fix the FsShell help messages for rm and rmr. 
 Contributed by Jakob Homan

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@793098 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                | 3 +++
 src/java/org/apache/hadoop/fs/FsShell.java | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9979aefe66..c70d07c0fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1011,6 +1011,9 @@ Release 0.20.1 - Unreleased
     HADOOP-5920. Fixes a testcase failure for TestJobHistory. 
     (Amar Kamat via ddas)
 
+    HADOOP-6139. Fix the FsShell help messages for rm and rmr.  (Jakob Homan
+    via szetszwo)
+
 Release 0.20.0 - 2009-04-15
 
   INCOMPATIBLE CHANGES
diff --git a/src/java/org/apache/hadoop/fs/FsShell.java b/src/java/org/apache/hadoop/fs/FsShell.java
index 3af28dc13e..634da87da0 100644
--- a/src/java/org/apache/hadoop/fs/FsShell.java
+++ b/src/java/org/apache/hadoop/fs/FsShell.java
@@ -1679,7 +1679,6 @@ public class FsShell extends Configured implements Tool {
                          " [-D <[property=value>]");
     } else if ("-ls".equals(cmd) || "-lsr".equals(cmd) ||
                "-du".equals(cmd) || "-dus".equals(cmd) ||
-               "-rm".equals(cmd) || "-rmr".equals(cmd) ||
                "-touchz".equals(cmd) || "-mkdir".equals(cmd) ||
                "-text".equals(cmd)) {
       System.err.println("Usage: java FsShell" + 
@@ -1689,6 +1688,9 @@ public class FsShell extends Configured implements Tool {
                          " [" + cmd + " [<path>]]");
     } else if (Count.matches(cmd)) {
       System.err.println(prefix + " [" + Count.USAGE + "]");
+    } else if ("-rm".equals(cmd) || "-rmr".equals(cmd)) {
+      System.err.println("Usage: java FsShell [" + cmd + 
+                           " [-skipTrash] <src>]");
     } else if ("-mv".equals(cmd) || "-cp".equals(cmd)) {
       System.err.println("Usage: java FsShell" + 
                          " [" + cmd + " <src> <dst>]");