X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmv%2Fmv_runner.rb;h=1fac09ef8c062026ee1bb6aaac49dd0e9386c26c;hp=fe44e5c244d3fe4cff66f140bb4d684ca903364a;hb=ef77e919fa61bb5ba7924d49a171dc3a05410a33;hpb=b947ef8844f090eedd50be0383abe417d910bb1a diff --git a/lib/mv/mv_runner.rb b/lib/mv/mv_runner.rb index fe44e5c..1fac09e 100644 --- a/lib/mv/mv_runner.rb +++ b/lib/mv/mv_runner.rb @@ -31,24 +31,10 @@ class MvRunner plugin.mv_user(src, dst) dst_description = plugin.describe(dst) - msg = "Moved user #{src} " - - # Only append the extra description if it's useful. - if not src_description.nil? and - not src_description.empty? and - not src_description == src.to_s() then - msg += "(#{src_description}) " - end - - msg += "to #{dst}" - - # Only append the extra description if it's useful. - if not dst_description.nil? and - not dst_description.empty? and - not dst_description == dst.to_s() then - msg += " (#{dst_description})" - end - + msg = "Moved user " + msg += add_description(src, src_description) + msg += " to " + msg += add_description(dst, dst_description) msg += "." report(plugin, msg)