From 2ca8fb9ab11167781256ddcfe4e3d352fa5f1a78 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Tue, 25 Nov 2008 09:35:53 -0700
Subject: [PATCH] Fix bug that caused get/put/upload/download to ignore blocks

---
 CHANGELOG.rdoc             | 2 ++
 lib/capistrano/transfer.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 3d746b5e..2b4ff076 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,7 @@
 == (unreleased)
 
+* Fix bug in transfer.rb that caused get/put/upload/download to ignore blocks passed to them [arika]
+
 * Fix issue with git SCM that caused "Unable to resolve revision" errors when there was trailing whitespace in git's output [Mark Zuneska, Daniel Berlinger and Evan Closson]
 
 
diff --git a/lib/capistrano/transfer.rb b/lib/capistrano/transfer.rb
index 88404475..c1b75e88 100644
--- a/lib/capistrano/transfer.rb
+++ b/lib/capistrano/transfer.rb
@@ -29,7 +29,7 @@ module Capistrano
       @to        = to
       @sessions  = sessions
       @options   = options
-      @callback  = callback
+      @callback  = block
 
       @transport = options.fetch(:via, :sftp)
       @logger    = options.delete(:logger)
@@ -213,4 +213,4 @@ module Capistrano
         end
       end
   end
-end
\ No newline at end of file
+end