shyouhei	2008-07-17 21:30:12 +0900 (Thu, 17 Jul 2008)

  New Revision: 18108

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18108

  Log:
    merge revision(s) 18058:
    * lib/optparse.rb (OptionParser#environment): requires shellwords.
      [ruby-dev:35466]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/optparse.rb
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 18107)
+++ ruby_1_8_6/ChangeLog	(revision 18108)
@@ -1,3 +1,8 @@
+Thu Jul 17 21:29:34 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser#environment): requires shellwords.
+	  [ruby-dev:35466]
+
 Thu Jul 17 01:36:02 2008  Yusuke Endoh  <mame@t...>
 
 	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 18107)
+++ ruby_1_8_6/version.h	(revision 18108)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-17"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080717
-#define RUBY_PATCHLEVEL 276
+#define RUBY_PATCHLEVEL 277
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/lib/optparse.rb
===================================================================
--- ruby_1_8_6/lib/optparse.rb	(revision 18107)
+++ ruby_1_8_6/lib/optparse.rb	(revision 18108)
@@ -1474,6 +1474,7 @@
   #
   def environment(env = File.basename($0, '.*'))
     env = ENV[env] || ENV[env.upcase] or return
+    require 'shellwords'
     parse(*Shellwords.shellwords(env))
   end
 

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