From 1498b668d2f8dc4eef3254dbdb2eb015a271fcf2 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Aug 2008 07:42:45 +0000
Subject: [PATCH] * lib/net/ftp.rb (chdir): handle 5xx errors correctly.  
 fixed [ruby-core:18057].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 lib/net/ftp.rb | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5476dfac3a..fb4345d043 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  5 16:40:06 2008  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
+	  fixed [ruby-core:18057].
+
 Tue Aug  5 16:38:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/win32.h, bcc32/Makefile.sub (config.h): bcc 5.8 has
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 855684de89..436ccd937f 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -722,9 +722,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