svn commit: r793099 - in /hadoop/common/branches/branch-0.20: CHANGES.txt src/core/org/apache/hadoop/fs/FsShell.java

[szetszwo]

Author: szetszwo
Date: Fri Jul 10 20:27:02 2009
New Revision: 793099

URL: http://svn.apache.org/viewvc?rev=793099&view=rev
Log:
HADOOP-6139. Fix the FsShell help messages for rm and rmr.  Contributed by 
Jakob Homan

Modified:
    hadoop/common/branches/branch-0.20/CHANGES.txt
    
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FsShell.java

Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=793099&r1=793098&r2=793099&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Fri Jul 10 20:27:02 2009
@@ -164,6 +164,9 @@
     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

Modified: 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FsShell.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FsShell.java?rev=793099&r1=793098&r2=793099&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FsShell.java 
(original)
+++ 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/FsShell.java 
Fri Jul 10 20:27:02 2009
@@ -1605,13 +1605,15 @@
                          " [-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>]");