ruby-changes:39731
From: nobu <ko1@a...>
Date: Wed, 9 Sep 2015 13:39:26 +0900 (JST)
Subject: [ruby-changes:39731] nobu:r51812 (trunk): extlibs.rb: patch options
nobu 2015-09-09 13:38:58 +0900 (Wed, 09 Sep 2015) New Revision: 51812 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51812 Log: extlibs.rb: patch options * 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 files: trunk/ChangeLog trunk/tool/extlibs.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 51811) +++ ChangeLog (revision 51812) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Wed Sep 9 13:38:56 2015 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 Sep 9 11:33:05 2015 NAKAMURA Usaku <usa@r...> * common.mk (update-gems): use BASERUBY instead of RUNRUBY. Index: tool/extlibs.rb =================================================================== --- tool/extlibs.rb (revision 51811) +++ tool/extlibs.rb (revision 51812) @@ -70,7 +70,7 @@ def do_patch(dest, patch, args) https://github.com/ruby/ruby/blob/trunk/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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/