From eae7c02fded460f6c8aaf18aa83d2730b89e0eb1 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 4 Dec 2014 17:48:28 -0800 Subject: [PATCH] ceph_objectstore_tool: Fix errors messages in newer code Signed-off-by: David Zafman --- src/tools/ceph_objectstore_tool.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index d01627e900218..114b2fc3ec1c0 100644 --- 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 found = lookup.pop();