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/branches/branch-0.20@793099 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -164,6 +164,9 @@ Release 0.20.1 - Unreleased
     MAPREDUCE-124. Fix a bug in failure handling of abort task of 
     OutputCommiter. (Amareshwari Sriramadasu via sharad)
 
+    HADOOP-6139. Fix the FsShell help messages for rm and rmr.  (Jakob Homan
+    via szetszwo)
+
 Release 0.20.0 - 2009-04-15
 
   INCOMPATIBLE CHANGES

src/core/org/apache/hadoop/fs/FsShell.java

@@ -1605,13 +1605,15 @@ 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" + 
                          " [" + 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>]");