From 3b57b151c9e69fe82c4928e967eceb627074fe3c Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Tue, 19 Apr 2011 15:48:55 +0000 Subject: [PATCH] HADOOP-7231. Fix synopsis for -count. Contributed by Daryn Sharp. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1095121 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/hadoop/fs/shell/Count.java | 2 +- src/test/core/org/apache/hadoop/cli/testConf.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index cf7ce4dd3b5..67b4ccbc123 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -150,6 +150,7 @@ Trunk (unreleased changes) HADOOP-7223. FileContext createFlag combinations are not clearly defined. (suresh) + HADOOP-7231. Fix synopsis for -count. (Daryn Sharp via eli). Release 0.22.0 - Unreleased diff --git a/src/java/org/apache/hadoop/fs/shell/Count.java b/src/java/org/apache/hadoop/fs/shell/Count.java index 93a04178e82..b365a2263e8 100644 --- a/src/java/org/apache/hadoop/fs/shell/Count.java +++ b/src/java/org/apache/hadoop/fs/shell/Count.java @@ -43,7 +43,7 @@ public class Count extends FsCommand { } public static final String NAME = "count"; - public static final String USAGE = "-" + NAME + "[-q] "; + public static final String USAGE = "-" + NAME + " [-q] ..."; public static final String DESCRIPTION = CommandUtils.formatDescription(USAGE, "Count the number of directories, files and bytes under the paths", "that match the specified file pattern. The output columns are:", diff --git a/src/test/core/org/apache/hadoop/cli/testConf.xml b/src/test/core/org/apache/hadoop/cli/testConf.xml index fd2bc8b2ce0..b14469dbcd3 100644 --- a/src/test/core/org/apache/hadoop/cli/testConf.xml +++ b/src/test/core/org/apache/hadoop/cli/testConf.xml @@ -222,7 +222,7 @@ RegexpComparator - ^-count\[-q\] <path>: Count the number of directories, files and bytes under the paths( )* + ^-count \[-q\] <path> \.\.\.: Count the number of directories, files and bytes under the paths( )* RegexpComparator