summaryrefslogtreecommitdiff
path: root/lib/net
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:33:36 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:33:36 +0000
commit3c299b5fe5d653e2ec231f6afb97445f8860c898 (patch)
treea981108a067e6a82e977a3d3f0f42346272f04e6 /lib/net
parent375cd73c201314a38bb9ced9d5b96a683d24bf6b (diff)
merge revision(s) 18371:
* lib/net/ftp.rb (chdir): handle 5xx errors correctly. backported from trunk. fixed [ruby-core:18057]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r--lib/net/ftp.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index ca2c00a790..2b195c2bab 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -668,9 +668,9 @@ module Net
begin
voidcmd("CDUP")
return
- rescue FTPPermError
- if $![0, 3] != "500"
- raise FTPPermError, $!
+ rescue FTPPermError => e
+ if e.message[0, 3] != "500"
+ raise e
end
end
end