rbd: don't print "image will expire at" message when trash_move() fails

idryomov · idryomov · commit 1fd79d41a527 · 2025-04-22T20:25:45.000+02:00
Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,13 @@ int execute_move(const po::variables_map &vm,`
`99`	`99`	`if (r < 0) {`
`100`	`100`	`std::cerr << "rbd: deferred delete error: " << cpp_strerror(r)`
`101`	`101`	`<< std::endl;`
	`102`	`+ return r;`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`if (expires_at != "now") {`
`105`	`106`	`std::cout << "rbd: image " << image_name << " will expire at " << exp_time << std::endl;`
`106`	`107`	`}`
`107`		`- return r;`
	`108`	`+ return 0;`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`void get_remove_arguments(po::options_description *positional,`