Don't print warnings when -q is set.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cf270df86..248c8fd19e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 14 15:01:09 2006  Eric Hodel <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+	  warnings when -q is set.
+
 Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
 
 	* configure.in: check sizeof(rlim_t).
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 5b5473bd99..dde017be7d 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1426,16 +1426,23 @@ module RDoc
 
     private 
 
-    def warn(msg)
+    def make_message(msg)
       prefix = "\n" + @input_file_name + ":"
       if @scanner
         prefix << "#{@scanner.line_no}:#{@scanner.char_no}: "
       end
-      $stderr.puts prefix + msg
+      return prefix + msg
+    end
+
+    def warn(msg)
+      return if @options.quiet
+      msg = make_message msg
+      $stderr.puts msg
     end
 
     def error(msg)
-      warn msg
+      msg = make_message msg
+      $stderr.puts msg
       exit(1)
     end