summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/optparse.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84671e90ee..4efb6226c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb: fix to override conv proc.
+
Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): inversed the order of errinfos.
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 5013700ae2..0c4b484e02 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