radosgw-admin: make 'log list' behave when .log pool dne

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index f06f8ba0dc85b14222fb8d27bac01a143ea46fe3..ef899e59472024ba9ef9eef0e3f13c37b603805c 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1085,21 +1085,25 @@ int main(int argc, char **argv)
     formatter->open_array_section("logs");
     RGWAccessHandle h;
     int r = store->list_objects_raw_init(log_bucket, &h);
-    if (r < 0) {
-      cerr << "log list: error " << r << std::endl;
-      return r;
-    }
-    while (true) {
-      RGWObjEnt obj;
-      int r = store->list_objects_raw_next(obj, &h);
-      if (r == -ENOENT)
-       break;
+    if (r == -ENOENT) {
+      // no logs.
+    } else {
       if (r < 0) {
        cerr << "log list: error " << r << std::endl;
        return r;
       }
-      formatter->dump_string("object", obj.name);
-    };
+      while (true) {
+       RGWObjEnt obj;
+       int r = store->list_objects_raw_next(obj, &h);
+       if (r == -ENOENT)
+         break;
+       if (r < 0) {
+         cerr << "log list: error " << r << std::endl;
+         return r;
+       }
+       formatter->dump_string("object", obj.name);
+      }
+    }
     formatter->close_section();
     formatter->flush(cout);
   }