diff --git a/lib/capistrano/command.rb b/lib/capistrano/command.rb index 7deeb5b6..7719a8fb 100644 --- a/lib/capistrano/command.rb +++ b/lib/capistrano/command.rb @@ -219,7 +219,7 @@ module Capistrano command_line = [environment, shell, cmd].compact.join(" ") ch[:command] = command_line - logger.trace command_line, ch[:server] if logger && options[:verbose_command_log] + logger.trace command_line, ch[:server] if logger ch.exec(command_line) ch.send_data(options[:data]) if options[:data] diff --git a/lib/capistrano/configuration/actions/invocation.rb b/lib/capistrano/configuration/actions/invocation.rb index d8f108ba..4af7f1a4 100644 --- a/lib/capistrano/configuration/actions/invocation.rb +++ b/lib/capistrano/configuration/actions/invocation.rb @@ -175,11 +175,7 @@ module Capistrano execute_on_servers(options) do |servers| targets = servers.map { |s| sessions[s] } - Command.process(tree, targets, options.merge( - :logger => logger, - :verbose_command_log => fetch(:verbose_command_log, false) - ) - ) + Command.process(tree, targets, options.merge(:logger => logger)) end end diff --git a/test/configuration_test.rb b/test/configuration_test.rb index a7090b1e..31f6a1b6 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -16,7 +16,7 @@ class ConfigurationTest < Test::Unit::TestCase process_args = Proc.new do |tree, session, opts| tree.fallback.command == "echo 'hello world'" && session == [:session] && - opts == { :logger => @config.logger, :verbose_command_log => false } + opts == { :logger => @config.logger } end Capistrano::Command.expects(:process).with(&process_args)