ruby-changes:74173
From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 15:02:47 +0900 (JST)
Subject: [ruby-changes:74173] 4388849ad3 (ruby_3_1): merge revision(s) e5e6b87e265b95620821f7abac56b5ab90d4c1fd:
https://git.ruby-lang.org/ruby.git/commit/?id=4388849ad3 From 4388849ad3076ab0fe3586445cc1175a0358aba4 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 21 Oct 2022 15:01:10 +0900 Subject: merge revision(s) e5e6b87e265b95620821f7abac56b5ab90d4c1fd: Create temporary file exclusively and clean --- ext/extmk.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- ext/extmk.rb | 9 +++++++-- version.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index 1624ec9099..40fc10ea1c 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -66,12 +66,17 @@ end https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L66 def atomic_write_open(filename) filename_new = filename + ".new.#$$" - open(filename_new, "wb") do |f| + clean = false + File.open(filename_new, "wbx") do |f| + clean = true yield f end if File.binread(filename_new) != (File.binread(filename) rescue nil) File.rename(filename_new, filename) - else + clean = false + end +ensure + if clean File.unlink(filename_new) end end diff --git a/version.h b/version.h index 480c930279..eca6b97876 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 139 +#define RUBY_PATCHLEVEL 140 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/