From 86ec7f6fe6ee5ed2c602f31d912c8785dc252957 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sat, 21 Oct 2006 17:06:37 +0000 Subject: [PATCH] Fix typo in default_io_proc so it correctly checks the stream parameter to see if it is the error stream git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@5332 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- CHANGELOG | 2 ++ lib/capistrano/actor.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b98e7fb5..8d99c954 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix typo in default_io_proc so it correctly checks the stream parameter to see if it is the error stream [Stephen Haberman] + * Make sure assets in images, javascripts, and stylesheets are touched after updating the code, to ensure the asset timestamping feature of rails works correctly [Jamis Buck] * Added warning if password is prompted for and termios is not installed [John Labovitz] diff --git a/lib/capistrano/actor.rb b/lib/capistrano/actor.rb index c6b6df33..d7ae01ae 100644 --- a/lib/capistrano/actor.rb +++ b/lib/capistrano/actor.rb @@ -38,7 +38,7 @@ module Capistrano self.transfer_factory = Transfer self.default_io_proc = Proc.new do |ch, stream, out| - level = out == :error ? :important : :info + level = stream == :error ? :important : :info ch[:actor].logger.send(level, out, "#{stream} :: #{ch[:host]}") end