usa	2008-06-25 18:56:11 +0900 (Wed, 25 Jun 2008)

  New Revision: 17572

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/cgi-lib.rb
    branches/ruby_1_8/lib/getopts.rb
    branches/ruby_1_8/lib/importenv.rb

  Log:
    * lib/{cgi-lib,getopts,importenv}.rb: check caller[0] because when
      required by -r option it's nil.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/importenv.rb?r1=17572&r2=17571&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/getopts.rb?r1=17572&r2=17571&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17572&r2=17571&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/cgi-lib.rb?r1=17572&r2=17571&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17571)
+++ ruby_1_8/ChangeLog	(revision 17572)
@@ -1,3 +1,8 @@
+Wed Jun 25 18:54:54 2008  NAKAMURA Usaku  <usa@r...>
+
+	* lib/{cgi-lib,getopts,importenv}.rb: check caller[0] because when
+	  required by -r option it's nil.
+
 Wed Jun 25 15:28:50 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
Index: ruby_1_8/lib/getopts.rb
===================================================================
--- ruby_1_8/lib/getopts.rb	(revision 17571)
+++ ruby_1_8/lib/getopts.rb	(revision 17572)
@@ -15,7 +15,7 @@
 # rewritten by Akinori MUSHA <knu@r...>
 #
 
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] and $VERBOSE
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')+':' if caller[0]} getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] and $VERBOSE
 
 $RCS_ID=%q$Header$
 
Index: ruby_1_8/lib/cgi-lib.rb
===================================================================
--- ruby_1_8/lib/cgi-lib.rb	(revision 17571)
+++ ruby_1_8/lib/cgi-lib.rb	(revision 17572)
@@ -1,4 +1,4 @@
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')+':' if caller[0]} cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
 
 =begin
 
Index: ruby_1_8/lib/importenv.rb
===================================================================
--- ruby_1_8/lib/importenv.rb	(revision 17571)
+++ ruby_1_8/lib/importenv.rb	(revision 17572)
@@ -7,7 +7,7 @@
 #  $USER = "matz"
 #  p ENV["USER"]
 
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: importenv is deprecated after Ruby 1.8.1 (no replacement)"
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')+':' if caller[0]} importenv is deprecated after Ruby 1.8.1 (no replacement)"
 
 for k,v in ENV
   next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/