* 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

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a3b031c48..dab945d8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 16 17:08:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (make_switch): do not clobber converter if pattern
+	  has no convert method.  reported by sheepman in [ruby-dev:30709].
+
 Mon Apr 16 16:49:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_seek): consistent behavior with
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