* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in

expand_name. (display_name rescues NotFoundError by itself, the original logic looks buggy...) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Mar 23, 2016 · 63436b3 · 63436b3
1 parent 7bfeb1c
commit 63436b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
+	  expand_name. (display_name rescues NotFoundError by itself,
+	  the original logic looks buggy...)
+
 Wed Mar 23 11:44:53 2016  cremno  <cremno@mail.ru>
 
 	* marshal.c (r_long): cast to `signed char`, which is used

diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
@@ -1089,10 +1089,8 @@ def interactive
 
       return if name.nil? or name.empty?
 
-      name = expand_name name.strip
-
       begin
-        display_name name
+        display_name expand_name(name.strip)
       rescue NotFoundError => e
         puts e.message
       end