X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=2f1083c5bb9f6e93368b2521db35ef68f9752711;hb=128dd1a915c7416311a8e9cc9aef79bc8c2904d4;hp=c5c315ee4bedcd0f48e3eb9cdf3ace0d991fb861;hpb=99f187d63f41e5d1fe740ab280192c3d42c28690;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c5c315e..2f1083c 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -575,9 +575,9 @@ sub setup {
     $class->setup_home( delete $flags->{home} );
 
     # YAML config support
-    my $confpath =
-      $class->path_to(
-        Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' );
+    my $confpath = $class->config->{file}
+      || $class->path_to(
+        ( Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' ) );
     my $conf = {};
     $conf = YAML::LoadFile($confpath) if -f $confpath;
     my $oldconf = $class->config;