From 85e4ea9133abb8b6b27b684c22113b0245eb760f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 15 Apr 2013 19:08:47 -0700 Subject: [PATCH] rgw-admin: fix some more merge issues Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index f818a8b844964..bc876456b487c 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1628,6 +1628,15 @@ next: } if (opt_cmd == OPT_BILOG_LIST) { + if (bucket_name.empty()) { + cerr << "ERROR: bucket not specified" << std::endl; + return -EINVAL; + } + int ret = init_bucket(bucket_name, bucket); + if (ret < 0) { + cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl; + return -ret; + } formatter->open_array_section("entries"); bool truncated; int count = 0; @@ -1636,7 +1645,7 @@ next: do { list entries; - int ret = store->list_bi_log_entries(bucket, marker, max_entries - count, entries, &truncated); + ret = store->list_bi_log_entries(bucket, marker, max_entries - count, entries, &truncated); if (ret < 0) { cerr << "ERROR: list_bi_log_entries(): " << cpp_strerror(-ret) << std::endl; return -ret; -- 2.39.5