aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/utils.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 63f3cc1951..17fb409f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 22 17:12:01 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/openssl/utils.rb (OpenSSL#silent): always restore $VERBOSE.
+ [ruby-dev:42285]
+
Wed Sep 22 16:59:40 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/test_prime.rb (TestPrime#test_new): the warning expected have
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index 0e19eec105..c116bf9e3e 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -138,7 +138,7 @@ Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
back, $VERBOSE = $VERBOSE, nil
yield
ensure
- $VERBOSE = back if back
+ $VERBOSE = back
end
end
end