From: Sebastian Riedel <sri@labs.kraih.com>
Date: Tue, 8 Mar 2005 19:44:14 +0000 (+0000)
Subject: for draven
X-Git-Tag: 5.7099_04~1775
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=0b944e631d7ef031353cf662671dea98095e43c7

for draven
---

diff --git a/Changes b/Changes
index 8552b1d..8a529af 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 This file documents the revision history for Perl extension Catalyst.
 
+4.22  Tue Mar 09 20:00:00 2005
+        - catch errors in application class
+
 4.21  Sat Mar 05 17:00:00 2005
         - fixed docs
 
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 6a73021..ab7de52 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -7,7 +7,7 @@ use Catalyst::Log;
 
 __PACKAGE__->mk_classdata($_) for qw/_config log/;
 
-our $VERSION = '4.21';
+our $VERSION = '4.22';
 our @ISA;
 
 =head1 NAME
diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 926885b..3f5452d 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -61,7 +61,8 @@ sub import {
     my $self = shift;
     $class = shift;
     $class->require;
-    if ( ( caller(0) )[1] eq '-e' ) {
+    my $caller = ( caller(0) )[1];
+    unless ( $INC{'Test/Builder.pm'} ) {
         die qq/Couldn't load "$class", "$@"/ if $@;
     }
     my $caller = caller(0);