summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:31:06 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:31:06 +0000
commit3ac9914334ca12c9cc6d6312b6e1ad7091fde4a3 (patch)
tree709eb785da6c04d6943de473f6ddb7c2f460c38b
parentc9d0983a8107f2598648b72ba9eff1805c2f6fa5 (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_7@18110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb1
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 423da3a..ea9100a 100644
--- 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
index 134b540..389a815 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1476,6 +1476,7 @@ class OptionParser
#
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
index fa8ba72..66765f7 100644
--- 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