diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/merger.rb | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Fri Apr 22 14:52:04 2016 NAKAMURA Usaku <usa@ruby-lang.org> + + * tool/merger.rb: remove temporary file. + Fri Apr 22 11:27:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> * lib/net/http.rb: Improve documentation for SSL requests via GET method. diff --git a/tool/merger.rb b/tool/merger.rb index c7d8e0f0ad..07ac6e6304 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -5,6 +5,7 @@ exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false # This needs ruby 1.9 and subversion. # run this in a repository to commit. +require 'fileutils' require 'tempfile' $repos = 'svn+ssh://svn@ci.ruby-lang.org/ruby/' @@ -169,6 +170,7 @@ else system 'svn up' system 'ruby tool/file2lastrev.rb --revision.h . > revision.tmp' system 'tool/ifchange "--timestamp=.revision.time" "revision.h" "revision.tmp"' + FileUtils.rm('revision.tmp') case ARGV[0] when /--ticket=(.*)/ |