From fc9a7983cfee35543b31d36f698d3b10ac9273ac Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 26 Dec 2007 17:32:22 +0000 Subject: [PATCH] * lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES occurs. this is a workaround for mswin32. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++-- lib/mkmf.rb | 12 ++++++++++-- version.h | 6 +++--- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ca4411e13..cdd2f00d84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,18 @@ +Thu Dec 27 02:25:45 2007 NAKAMURA Usaku + + * lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES + occurs. this is a workaround for mswin32. + Wed Dec 26 22:47:31 2007 NARUSE, Yui - * lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of + * lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of Resolv::DNS::Label::Str. * lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string is not defined, so replace to_s. - * lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by ip6.arpa. + * lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by + ip6.arpa. Wed Dec 26 21:27:02 2007 Tadayoshi Funaba diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 853f2f4da8..055ed226ea 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -297,8 +297,16 @@ end def create_tmpsrc(src) src = yield(src) if block_given? src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n") - open(CONFTEST_C, "wb") do |cfile| - cfile.print src + count = 0 + begin + open(CONFTEST_C, "wb") do |cfile| + cfile.print src + end + rescue Errno::EACCES + if (count += 1) < 5 + sleep 0.2 + retry + end end src end diff --git a/version.h b/version.h index 4e2eb8221e..d2edf48ac6 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-12-26" +#define RUBY_RELEASE_DATE "2007-12-27" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071226 +#define RUBY_RELEASE_CODE 20071227 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];