From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 16 Apr 2013 02:08:47 +0000 (-0700)
Subject: rgw-admin: fix some more merge issues
X-Git-Tag: v0.67-rc1~128^2~161
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85e4ea9133abb8b6b27b684c22113b0245eb760f;p=ceph.git

rgw-admin: fix some more merge issues

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index f818a8b8449..bc876456b48 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<rgw_bi_log_entry> 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;