aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-08 04:57:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-08 04:57:59 +0000
commit64be577b5398fda13ad0e0ad52e18e8d01549c6e (patch)
treef3cc0dd35ff3cc4f55c6dacbf1621c4e94dd273a
parent0b05fc5a85f0b88c35e63735db14f62c66ae2b9e (diff)
downloadruby-64be577b5398fda13ad0e0ad52e18e8d01549c6e.tar.gz
* lib/mkmf.rb (Logging.postpone): copy postponed output always.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c4dfbefd3..504d0a9c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-Wed Apr 8 11:46:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 8 13:57:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (what_type?): fixed typo.
+ * lib/mkmf.rb (Logging.postpone): copy postponed output always.
Wed Apr 8 09:45:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 04bdbdf4a7..63c6007c34 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -273,9 +273,9 @@ module Logging
@log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
begin
log.print(open {yield})
+ ensure
@log.close
File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
- ensure
@log, @logfile, @orgout, @orgerr = log, *save
@postpone -= 1
rm_f tmplog