* lib/optparse.rb (make_switch): do not clobber converter if pattern

  has no convert method.  reported by sheepman in [ruby-dev:30709].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 2c91cd004f..5013700ae2 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1077,7 +1077,7 @@ class OptionParser
       # directly specified pattern(any object possible to match)
       if !(String === o) and o.respond_to?(:match)
         pattern = notwice(o, pattern, 'pattern')
-        conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+        conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
         next
       end
 
@@ -1090,7 +1090,7 @@ class OptionParser
         when CompletingHash
         when nil
           pattern = CompletingHash.new
-          conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+          conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
         else
           raise ArgumentError, "argument pattern given twice"
         end