From 663054e73c833848e445341df4a1e1b3a7e8e17a Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 21 Apr 2025 16:52:02 +0200 Subject: [PATCH] rbd: don't print "image will expire at" message when trash_move() fails Signed-off-by: Ilya Dryomov (cherry picked from commit 1fd79d41a527ae0e0e4a66a18d67c4b180f66106) --- src/tools/rbd/action/Trash.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc index f1fd4df3c36..3e7c039102d 100644 --- a/src/tools/rbd/action/Trash.cc +++ b/src/tools/rbd/action/Trash.cc @@ -99,12 +99,13 @@ int execute_move(const po::variables_map &vm, if (r < 0) { std::cerr << "rbd: deferred delete error: " << cpp_strerror(r) << std::endl; + return r; } if (expires_at != "now") { std::cout << "rbd: image " << image_name << " will expire at " << exp_time << std::endl; } - return r; + return 0; } void get_remove_arguments(po::options_description *positional, -- 2.39.5