shyouhei	2009-01-11 11:32:47 +0900 (Sun, 11 Jan 2009)

  New Revision: 21427

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21427

  Log:
    merge revision(s) 18371:
    * lib/net/ftp.rb (chdir): handle 5xx errors correctly.
      backported from trunk.  fixed [ruby-core:18057].

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/net/ftp.rb
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21426)
+++ ruby_1_8_6/ChangeLog	(revision 21427)
@@ -1,3 +1,8 @@
+Sun Jan 11 11:31:52 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
+	  backported from trunk.  fixed [ruby-core:18057].
+
 Fri Jan  9 19:22:24 2009  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21426)
+++ ruby_1_8_6/version.h	(revision 21427)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-09"
+#define RUBY_RELEASE_DATE "2009-01-11"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090109
-#define RUBY_PATCHLEVEL 294
+#define RUBY_RELEASE_CODE 20090111
+#define RUBY_PATCHLEVEL 295
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/net/ftp.rb
===================================================================
--- ruby_1_8_6/lib/net/ftp.rb	(revision 21426)
+++ ruby_1_8_6/lib/net/ftp.rb	(revision 21427)
@@ -664,9 +664,9 @@
 	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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/