summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-15 07:22:57 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-15 07:22:57 +0000
commit5dde183d0ad5362174e4f2cfac080b667c230089 (patch)
treeab2ea9ec89cb912f73ea09edc642ebcfa32da5dd
parent1148f6a327e23a003640f2dc691b20a5bf826a04 (diff)
* lib/mkmf.rb (Logging.postpone): close @log only when it's available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 156c3adf21..239c20c774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 15 16:14:31 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (Logging.postpone): close @log only when it's available.
+
Sun Aug 15 13:30:35 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.h (VpVtoD): fix a type of e.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 819cada514..5e347a7dbc 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -278,7 +278,7 @@ module Logging
begin
log.print(open {yield})
ensure
- @log.close
+ @log.close if @log
File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
@log, @logfile, @orgout, @orgerr = log, *save
@postpone -= 1