ceph_objectstore_tool: Fix errors messages in newer code

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index d01627e900218c8769714f5a5d50666f4953d99f..114b2fc3ec1c0db525d52042f709c41edab7fff5 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2324,12 +2324,15 @@ int main(int argc, char **argv)
       if (!json_spirit::read(object, v)) {
        lookup_ghobject lookup(object);
        if (action_on_all_objects(fs, lookup, debug)) {
-         throw std::runtime_error(object + " is neither valid json nor an object name");
+         throw std::runtime_error("Internal error");
        } else {
          if (lookup.size() != 1) {
            stringstream ss;
-           ss << "expected a single object named " << object
-              << " but got " << lookup.size() << " instead";
+           if (lookup.size() == 0)
+             ss << objcmd << ": " << cpp_strerror(ENOENT);
+           else
+             ss << "expected a single object named '" << object
+                << "' but got " << lookup.size() << " instead";
            throw std::runtime_error(ss.str());
          }
          pair<coll_t, ghobject_t> found = lookup.pop();