kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

extlibs.rb: patch options

Browse source 
* 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".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-09-09 04:38:58 +00:00
parent dbe4a7f11c
commit abd5b8e1db
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Sep 9 13:38:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org>
* common.mk (update-gems): use BASERUBY instead of RUNRUBY.

2
tool/extlibs.rb
View file

@ -70,7 +70,7 @@ def do_patch(dest, patch, args)
$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