summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:32:47 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:32:47 +0000
commit720dc250a1658134eef68f64b452399815130942 (patch)
tree863b4c328841d8314b44b5360cef564fc8c3545c /lib
parentf67887c18e3cec3d912bef65852aa6caa1e7682e (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_6@21427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-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 bee60d559c..737a7ebca1 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -664,9 +664,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