From 3d6e5ff765bcb3326c341b709357843244f60862 Mon Sep 17 00:00:00 2001 From: Fabien Dupont Date: Fri, 5 Apr 2019 16:19:33 -0400 Subject: [PATCH] Fix rubocop --- app/models/conversion_host.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/conversion_host.rb b/app/models/conversion_host.rb index 4f73df18209..97640b3702f 100644 --- a/app/models/conversion_host.rb +++ b/app/models/conversion_host.rb @@ -317,11 +317,10 @@ def ansible_playbook(playbook, extra_vars = {}, update_task = true, auth_type = rescue => e errormsg = "Ansible playbook '#{playbook}' failed for '#{resource.name}' with [#{e.class}: #{e}]" _log.error(errormsg) - task.error(errormsg) unless task.nil? + task&.error(errormsg) raise e ensure - context = task.context_data - task.update_context(task.context_data.merge!(:ansible_output => result.output)) unless task.nil? || result.nil? + task&.update_context(task.context_data.merge!(:ansible_output => result.output)) unless result.nil? File.delete(runner_password_file) if !runner_password_file.nil? && File.exist?(runner_password_file) File.delete(runner_ssh_key_file) if !runner_ssh_key_file.nil? && File.exist?(runner_ssh_key_file) end