From 7cd4c688de49846b97951ef3dcf8afa892c4386a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 26 Sep 2011 14:03:12 -0700 Subject: [PATCH] radosgw_admin: 'bucket list' or 'buckets list' The plural looks weird to me. Signed-off-by: Sage Weil --- src/rgw/rgw_admin.cc | 4 +++- src/test/cli/radosgw_admin/help.t | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index a91ad2a01ea57..eb58969e4d75a 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -42,7 +42,7 @@ void _usage() cerr << " subuser rm remove subuser\n"; cerr << " key create create access key\n"; cerr << " key rm remove access key\n"; - cerr << " buckets list list buckets\n"; + cerr << " bucket list list buckets\n"; cerr << " bucket link link bucket to specified user\n"; cerr << " bucket unlink unlink bucket from specified user\n"; cerr << " bucket stats returns bucket statistics\n"; @@ -222,6 +222,8 @@ static int get_cmd(const char *cmd, const char *prev_cmd, bool *need_more) if (strcmp(cmd, "list") == 0) return OPT_BUCKETS_LIST; } else if (strcmp(prev_cmd, "bucket") == 0) { + if (strcmp(cmd, "list") == 0) + return OPT_BUCKETS_LIST; if (strcmp(cmd, "link") == 0) return OPT_BUCKET_LINK; if (strcmp(cmd, "unlink") == 0) diff --git a/src/test/cli/radosgw_admin/help.t b/src/test/cli/radosgw_admin/help.t index 8860c3cdd02b1..63ee6e52c4445 100644 --- a/src/test/cli/radosgw_admin/help.t +++ b/src/test/cli/radosgw_admin/help.t @@ -12,7 +12,7 @@ subuser rm remove subuser key create create access key key rm remove access key - buckets list list buckets + bucket list list buckets bucket link link bucket to specified user bucket unlink unlink bucket from specified user bucket stats returns bucket statistics -- 2.39.5