diff options
author | Jeremy Evans <code@jeremyevans.net> | 2020-03-09 09:42:40 -0700 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-12 18:38:47 +0900 |
commit | 7cddb844e6d51f954c6669341b9cc656bd7d3492 (patch) | |
tree | 53788343ab44c7068ef43e5e69470451e7a2f189 | |
parent | e2678781c739edb17f1744d35a9958146e880996 (diff) | |
download | ruby-7cddb844e6d51f954c6669341b9cc656bd7d3492.tar.gz |
[ruby/fileutils] Make verbose output go to stdout instead of stderr
Verbose output is not error output, and should be sent to
stdout and not stderr.
Fixes Ruby bug 4436
https://github.com/ruby/fileutils/commit/563a383025
-rw-r--r-- | lib/fileutils.rb | 2 | ||||
-rw-r--r-- | test/fileutils/test_fileutils.rb | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 64f3ae6de9..56b0c1a555 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1615,7 +1615,7 @@ module FileUtils def fu_output_message(msg) #:nodoc: output = @fileutils_output if defined?(@fileutils_output) - output ||= $stderr + output ||= $stdout if defined?(@fileutils_label) msg = @fileutils_label + msg end diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 4951ca47fc..e9a21beeba 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -1720,16 +1720,16 @@ class TestFileUtils < Test::Unit::TestCase o.extend(FileUtils) o.singleton_class.send(:public, :chdir) o.freeze - orig_stderr = $stderr - $stderr = StringIO.new + orig_stdout = $stdout + $stdout = StringIO.new o.chdir('.', verbose: true){} - $stderr.rewind - assert_equal(<<-END, $stderr.read) + $stdout.rewind + assert_equal(<<-END, $stdout.read) cd . cd - END ensure - $stderr = orig_stderr if orig_stderr + $stdout = orig_stdout if orig_stdout end def test_getwd |