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
This commit is contained in:
Tsz-wo Sze 2009-07-10 20:26:30 +00:00
parent c38c5a43ff
commit d074c686b3
2 changed files with 6 additions and 1 deletions

View File

@ -1011,6 +1011,9 @@ Release 0.20.1 - Unreleased
HADOOP-5920. Fixes a testcase failure for TestJobHistory. HADOOP-5920. Fixes a testcase failure for TestJobHistory.
(Amar Kamat via ddas) (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 Release 0.20.0 - 2009-04-15
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -1679,7 +1679,6 @@ private static void printUsage(String cmd) {
" [-D <[property=value>]"); " [-D <[property=value>]");
} else if ("-ls".equals(cmd) || "-lsr".equals(cmd) || } else if ("-ls".equals(cmd) || "-lsr".equals(cmd) ||
"-du".equals(cmd) || "-dus".equals(cmd) || "-du".equals(cmd) || "-dus".equals(cmd) ||
"-rm".equals(cmd) || "-rmr".equals(cmd) ||
"-touchz".equals(cmd) || "-mkdir".equals(cmd) || "-touchz".equals(cmd) || "-mkdir".equals(cmd) ||
"-text".equals(cmd)) { "-text".equals(cmd)) {
System.err.println("Usage: java FsShell" + System.err.println("Usage: java FsShell" +
@ -1689,6 +1688,9 @@ private static void printUsage(String cmd) {
" [" + cmd + " [<path>]]"); " [" + cmd + " [<path>]]");
} else if (Count.matches(cmd)) { } else if (Count.matches(cmd)) {
System.err.println(prefix + " [" + Count.USAGE + "]"); 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)) { } else if ("-mv".equals(cmd) || "-cp".equals(cmd)) {
System.err.println("Usage: java FsShell" + System.err.println("Usage: java FsShell" +
" [" + cmd + " <src> <dst>]"); " [" + cmd + " <src> <dst>]");