lib,test: replace connection query() method with sync_exec{,_params}.

[mailshears.git] / lib / rm / rm_runner.rb

diff --git a/lib/rm/rm_runner.rb b/lib/rm/rm_runner.rb
index 4162ddf531192e549b48eaf10a7760271e402f78..1c2d344475e27d3f763553d15dfbbfb37fbe4d40 100644 (file)
--- a/lib/rm/rm_runner.rb
+++ b/lib/rm/rm_runner.rb
@@ -39,14 +39,8 @@ class RmRunner
 
     begin
       plugin.remove(target)
-      msg =  "Removed #{target.class.to_s().downcase()} #{target}"
-
-      # Only append the extra description if it's useful.
-      if not target_description.nil? and
-         not target_description.empty? and
-         not target_description == target.to_s() then
-        msg += " (#{target_description})"
-      end
+      msg =  "Removed #{target.class.to_s().downcase()} "
+      msg += add_description(target, target_description)
       msg += '.'
 
       report(plugin, msg)