From 364d1f348170b43529694d23305116ccd505c511 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 11 May 2009 15:05:43 +0000 Subject: merges r23286 from trunk into ruby_1_9_1. -- * lib/optparse.rb (OptionParser#parse_in_order): do not make an option from non-option argument. [ruby-dev:38333] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/optparse.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/optparse.rb') diff --git a/lib/optparse.rb b/lib/optparse.rb index 0397382a6..33a65c455 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1298,7 +1298,7 @@ class OptionParser begin opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq} raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}" - argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-' + argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-') val = cb.call(val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError -- cgit