shyouhei	2008-07-17 21:31:06 +0900 (Thu, 17 Jul 2008)

  New Revision: 18110

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

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

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18109)
+++ ruby_1_8_7/ChangeLog	(revision 18110)
@@ -1,3 +1,8 @@
+Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser#environment): requires shellwords.
+	  [ruby-dev:35466]
+
 Thu Jul 17 02:05:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18109)
+++ ruby_1_8_7/version.h	(revision 18110)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-17"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080717
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/optparse.rb
===================================================================
--- ruby_1_8_7/lib/optparse.rb	(revision 18109)
+++ ruby_1_8_7/lib/optparse.rb	(revision 18110)
@@ -1476,6 +1476,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/