[Jifty-commit] r3254 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri May 18 18:52:59 2007
New Revision: 3254

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

Log:
 r56955 at pinglin:  jesse | 2007-05-18 18:46:53 -0400
 * Cause more compiliation failures to actually stop the app from running
 


Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Fri May 18 18:52:59 2007
@@ -241,11 +241,15 @@
     if ($UNIVERSAL::require::ERROR) {
         my $error = $UNIVERSAL::require::ERROR;
         $error =~ s/ at .*?\n$//;
-        
-        unless ($args{'quiet'} and $error =~ /^Can't locate/) {
+        if ($args{'quiet'} and $error =~ /^Can't locate/) {
+            return 0;
+        }
+        elsif ( $UNIVERSAL::require::ERROR !~ /^Can't locate/) {
+                die $UNIVERSAL::require::ERROR;
+        } else {
             Jifty->log->error(sprintf("$error at %s line %d\n", (caller(1))[1,2]));
+            return 0;
         }
-        return 0;
     }
 
     # If people forget the '1;' line in the dispatcher, don't eit them