Skip to content

Commit

Permalink
Fixes #12437 - handle blank proxy command output
Browse files Browse the repository at this point in the history
  • Loading branch information
iNecas committed Nov 11, 2015
1 parent c36dacf commit 74937aa
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions app/lib/actions/remote_execution/run_proxy_command.rb
Expand Up @@ -68,8 +68,9 @@ def current_proxy_output

def finalized_output
records = []
if self.output[:proxy_output].present?
records.concat(self.output[:proxy_output].fetch(:result, []))

if proxy_result.present?
records.concat(proxy_result)
else
records << format_output(_('No output'))
end
Expand All @@ -81,6 +82,10 @@ def finalized_output
end
return records
end

def proxy_results
self.output.fetch(:proxy_output, {}).fetch(:result, []) || []
end
end
end
end

0 comments on commit 74937aa

Please sign in to comment.