yugui	2009-12-05 18:39:28 +0900 (Sat, 05 Dec 2009)

  New Revision: 26009

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

  Log:
    merges r24620 from trunk into ruby_1_9_1. fixes the backport task #1976.
    --
    * lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
      [ruby-dev:39153]

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26008)
+++ ruby_1_9_1/ChangeLog	(revision 26009)
@@ -1,3 +1,8 @@
+Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+	  [ruby-dev:39153]
+
 Tue Oct 20 14:50:51 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_here_document): dispatch delayed heredoc
Index: ruby_1_9_1/lib/mkmf.rb
===================================================================
--- ruby_1_9_1/lib/mkmf.rb	(revision 26008)
+++ ruby_1_9_1/lib/mkmf.rb	(revision 26009)
@@ -191,11 +191,13 @@
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[*files.flatten(1)])
+  opt = ([files.pop] if Hash === files.last)
+  FileUtils.rm_f(Dir[*files.flatten(1)], *opt)
 end
 
 def rm_rf(*files)
-  FileUtils.rm_rf(Dir[*files.flatten(1)])
+  opt = ([files.pop] if Hash === files.last)
+  FileUtils.rm_rf(Dir[*files.flatten(1)], *opt)
 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 26008)
+++ ruby_1_9_1/version.h	(revision 26009)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 362
+#define RUBY_PATCHLEVEL 363
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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