diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-17 12:30:12 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-17 12:30:12 +0000 |
commit | 98d848a90bfb72da552c2705c2dbecbdbc72ad8c (patch) | |
tree | fa6c85432e880f265f8563a96a177450feb7de4d | |
parent | dbfbe18a4080cf22425f2a19f4bc5818a5757ad7 (diff) |
merge revision(s) 18058:
* lib/optparse.rb (OptionParser#environment): requires shellwords.
[ruby-dev:35466]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/optparse.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jul 17 21:29:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (OptionParser#environment): requires shellwords. + [ruby-dev:35466] + Thu Jul 17 01:36:02 2008 Yusuke Endoh <mame@tsg.ne.jp> * ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo. [ruby-core:17713] diff --git a/lib/optparse.rb b/lib/optparse.rb index 417997d9bb..80b16fa18d 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1474,6 +1474,7 @@ class OptionParser # def environment(env = File.basename($0, '.*')) env = ENV[env] || ENV[env.upcase] or return + require 'shellwords' parse(*Shellwords.shellwords(env)) end @@ -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 |