[Jifty-commit] r3220 - in jifty/trunk: lib/Jifty/Module

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Thu May 10 14:21:06 2007
New Revision: 3220

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Module/Pluggable.pm

Log:
 r56777 at pinglin:  jesse | 2007-05-10 14:20:18 -0400
 * Make compile errors in autorequired modules fatal


Modified: jifty/trunk/lib/Jifty/Module/Pluggable.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Module/Pluggable.pm	(original)
+++ jifty/trunk/lib/Jifty/Module/Pluggable.pm	Thu May 10 14:21:06 2007
@@ -56,7 +56,10 @@
     no warnings; # This is lexical and turns off exactly one warning below -- "Can't locate package in @ISA".
                  # (for some reason, "no warnings 'syntax'" does not work as advertised here.)
                  # Note that it does _not_ turn off warnings triggered in the $module itself.
-    $module->require(); # We'd prefer to use Jifty::Util->require() here, but it spews crazy warnings
+    if ((not $module->require()) &&  ( $UNIVERSAL::require::ERROR !~ /^Can't locate/)) {
+        die $UNIVERSAL::require::ERROR;    
+    } 
+         # We'd prefer to use Jifty::Util->require() here, but it spews crazy warnings
 
     return $UNIVERSAL::require::ERROR;
 }