diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-27 06:47:41 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-27 06:47:41 +0000 |
| commit | 613a324f6156f3dc3b666ceef23ad7e54df59a37 (patch) | |
| tree | 1e672827e6db36f941607a0532361e426b3b0921 | |
| parent | 718a78b76a8ef3508b38d035afb683ebe6e900b2 (diff) | |
* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
a Pathname instance into a string. [ruby-core:26237]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Oct 27 15:44:48 2009 Shugo Maeda <[email protected]> + + * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert + a Pathname instance into a string. [ruby-core:26237] + Tue Oct 27 12:30:16 2009 Nobuyoshi Nakada <[email protected]> * gc.h (SET_MACHINE_STACK_END): use __i386__ instead of __i386, diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 8ae3e1610f..52bd37595d 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -523,7 +523,7 @@ module Net end begin f.binmode if localfile - retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data| + retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data| f.write(data) if localfile yield(data) if block_given? result.concat(data) if result @@ -656,7 +656,7 @@ module Net def list(*args, &block) # :yield: line cmd = "LIST" args.each do |arg| - cmd = cmd + " " + arg + cmd = cmd + " " + arg.to_s end if block retrlines(cmd, &block) |