matz	2008-10-23 16:21:05 +0900 (Thu, 23 Oct 2008)

  New Revision: 19899

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19899

  Log:
    * lib/irb/init.rb (IRB.load_modules): catch LoadError explicitly.
      a patch from Daniel Berger <Daniel.Berger at qwest.com> in
      [ruby-core:19451].  fix [ruby-core:19450]

  Modified files:
    trunk/ChangeLog
    trunk/lib/irb/init.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19898)
+++ ChangeLog	(revision 19899)
@@ -1,3 +1,9 @@
+Thu Oct 23 16:19:33 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/irb/init.rb (IRB.load_modules): catch LoadError explicitly.
+	  a patch from Daniel Berger <Daniel.Berger at qwest.com> in
+	  [ruby-core:19451].  fix [ruby-core:19450]
+
 Thu Oct 23 16:16:17 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/socket.c (sock_s_getservbyport): check if the port range.
Index: lib/irb/init.rb
===================================================================
--- lib/irb/init.rb	(revision 19898)
+++ lib/irb/init.rb	(revision 19899)
@@ -247,8 +247,8 @@
     for m in @CONF[:LOAD_MODULES]
       begin
 	require m
-      rescue # StandardError, ScriptError
-	print $@[0], ":", $!.class, ": ", $!, "\n"
+      rescue LoadError => err
+	warn err.backtrace[0] << ":#{err.class}: #{err}"
       end
     end
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/