app/lib/actions/katello/repository/errata_mail.rb in katello-2.4.5 vs app/lib/actions/katello/repository/errata_mail.rb in katello-3.0.0.rc1

@@ -1,21 +1,29 @@
 module Actions
   module Katello
     module Repository
       class ErrataMail < Actions::EntryAction
-        def plan(repo, last_updated = nil)
+        middleware.use Actions::Middleware::ExecuteIfContentsChanged
+
+        def plan(repo, last_updated = nil, contents_changed = nil)
           last_updated ||= repo.repository_errata.order('updated_at ASC').last.try(:updated_at) || Time.now
-          plan_self(:repo => repo.id, :last_updated => last_updated.to_s)
+          plan_self(:repo => repo.id, :last_updated => last_updated.to_s, :contents_changed => contents_changed)
         end
 
         def run
           ::User.current = ::User.anonymous_admin
 
           repo = ::Katello::Repository.find(input[:repo])
           users = ::User.select { |user| user.receives?(:katello_sync_errata) && user.can?(:view_products, repo.product) }.compact
           errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', input[:last_updated].to_datetime).pluck(:erratum_id))
 
-          MailNotification[:katello_sync_errata].deliver(:users => users, :repo => repo, :errata => errata) unless users.blank?
+          begin
+            MailNotification[:katello_sync_errata].deliver(:users => users, :repo => repo, :errata => errata) unless users.blank?
+          rescue => e
+            message = _('Unable to send errata e-mail notification: %{error}' % {:error => e})
+            Rails.logger.error(message)
+            output[:result] = message
+          end
         end
 
         def finalize
           ::User.current = nil
         end