yugui	2009-11-17 15:13:03 +0900 (Tue, 17 Nov 2009)

  New Revision: 25809

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

  Log:
    merges r24984 and r24987 from trunk into ruby_1_9_1.
    --
    * lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
      [ruby-dev:39345]
    --
    * test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/mkmf.rb
    branches/ruby_1_9_1/test/fileutils/test_fileutils.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25808)
+++ ruby_1_9_1/ChangeLog	(revision 25809)
@@ -1,3 +1,12 @@
+Fri Sep 18 07:06:41 2009  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
+
+Fri Sep 18 06:36:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+	  [ruby-dev:39345]
+
 Thu Oct 29 01:22:01 2009  Yutaka Kanemoto  <kanemoto@r...>
 
 	* ext/socket/extconf.rb : Compilation failure on AIX.
Index: ruby_1_9_1/lib/mkmf.rb
===================================================================
--- ruby_1_9_1/lib/mkmf.rb	(revision 25808)
+++ ruby_1_9_1/lib/mkmf.rb	(revision 25809)
@@ -191,11 +191,11 @@
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[*files])
+  FileUtils.rm_f(Dir[*files.flatten(1)])
 end
 
 def rm_rf(*files)
-  FileUtils.rm_rf(Dir[*files])
+  FileUtils.rm_rf(Dir[*files.flatten(1)])
 end
 
 # Returns time stamp of the +target+ file if it exists and is newer
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25808)
+++ ruby_1_9_1/version.h	(revision 25809)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 334
+#define RUBY_PATCHLEVEL 336
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_1_9_1/test/fileutils/test_fileutils.rb	(revision 25808)
+++ ruby_1_9_1/test/fileutils/test_fileutils.rb	(revision 25809)
@@ -435,6 +435,11 @@
     assert_file_not_exist 'tmp/rmtmp2'
     assert_file_not_exist 'tmp/rmtmp3'
     assert_file_exist 'tmp/rmtmp4'
+
+    # [ruby-dev:39345]
+    touch 'tmp/[rmtmp]'
+    rm_f 'tmp/[rmtmp]'
+    assert_file_not_exist 'tmp/[rmtmp]'
   end
 
   def test_rm_r

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