nagachika	2016-03-30 06:39:14 +0900 (Wed, 30 Mar 2016)

  New Revision: 54431

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54431

  Log:
    merge revision(s) 51812:
    
    * tool/extlibs.rb (do_patch): let "patch" command change the
      working directory and open the patch file there, instead of
      spawn options, so that proper error message will be shown by the
      command not just "chdir" or "open".

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/tool/extlibs.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54430)
+++ ruby_2_2/version.h	(revision 54431)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-30"
-#define RUBY_PATCHLEVEL 289
+#define RUBY_PATCHLEVEL 290
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54430)
+++ ruby_2_2/ChangeLog	(revision 54431)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Mar 30 06:37:56 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/extlibs.rb (do_patch): let "patch" command change the
+	  working directory and open the patch file there, instead of
+	  spawn options, so that proper error message will be shown by the
+	  command not just "chdir" or "open".
+
 Wed Mar 30 06:11:36 2016  NARUSE, Yui  <naruse@r...>
 
 	* thread_pthread.c (reserve_stack): fix reserving position where
Index: ruby_2_2/tool/extlibs.rb
===================================================================
--- ruby_2_2/tool/extlibs.rb	(revision 54430)
+++ ruby_2_2/tool/extlibs.rb	(revision 54431)
@@ -70,7 +70,7 @@ def do_patch(dest, patch, args) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/tool/extlibs.rb#L70
     $stdout.puts "applying #{patch} under #{dest}"
     $stdout.flush
   end
-  Process.wait(Process.spawn("patch", *args, in: File.join(dest, patch), chdir: dest))
+  Process.wait(Process.spawn("patch", "-d", dest, "-i", patch, *args))
   $?.success? or raise "failed to patch #{patch}"
 end
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51812


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