merge revision(s) 18058:

shyouhei · shyouhei · commit 3ac9914334ca · 2008-07-17T12:31:06.000Z
* lib/optparse.rb (OptionParser#environment): requires shellwords.
	  [ruby-dev:35466]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#environment): requires shellwords.
+	  [ruby-dev:35466]
+
 Thu Jul 17 02:05:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
diff --git a/lib/optparse.rb b/lib/optparse.rb
@@ -1476,6 +1476,7 @@ def load(filename = nil)
   #
   def environment(env = File.basename($0, '.*'))
     env = ENV[env] || ENV[env.upcase] or return
+    require 'shellwords'
     parse(*Shellwords.shellwords(env))
   end
 
diff --git a/version.h b/version.h
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1476,6 +1476,7 @@ def load(filename = nil)`
`1476`	`1476`	`#`
`1477`	`1477`	`def environment(env = File.basename($0, '.*'))`
`1478`	`1478`	`env = ENV[env] \|\| ENV[env.upcase] or return`
	`1479`	`+ require 'shellwords'`
`1479`	`1480`	`parse(*Shellwords.shellwords(env))`
`1480`	`1481`	`end`
`1481`	`1482`