X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny.pm;h=fe5edbfc34ca37d0994564bf30296023e62c5cb8;hp=4c614d7b7828fbe926659f066902f1f03e3d0f1a;hb=045053ac27df40c119576d2f82b0390b1c431eb9;hpb=a86df341bff3173831af40e70e915c8ea701cacf

diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm
index 4c614d7..fe5edbf 100644
--- a/lib/Config/Any.pm
+++ b/lib/Config/Any.pm
@@ -6,7 +6,7 @@ use warnings;
 use Carp;
 use Module::Pluggable::Object ();
 
-our $VERSION = '0.23';
+our $VERSION = '0.28';
 
 =head1 NAME
 
@@ -194,12 +194,16 @@ sub _load {
         for my $loader ( @try_plugins ) {
             next unless $loader->is_supported;
             $supported = 1;
-            my @configs
-                = eval { $loader->load( $filename, $loader_args{ $loader } ); };
+            my @configs;
+            my $err = do {
+                local $@;
+                @configs = eval { $loader->load( $filename, $loader_args{ $loader } ); };
+                $@;
+            };
 
             # fatal error if we used extension matching
-            croak "Error parsing $filename: $@" if $@ and $use_ext_lut;
-            next if $@ or !@configs;
+            croak "Error parsing $filename: $err" if $err and $use_ext_lut;
+            next if $err or !@configs;
 
             # post-process config with a filter callback
             if ( $args->{ filter } ) {
@@ -310,7 +314,7 @@ Config::Any requires no configuration files or environment variables.
 
 =head1 DEPENDENCIES
 
-L<Module::Pluggable|Module::Pluggable>
+L<Module::Pluggable::Object|Module::Pluggable::Object>
 
 And at least one of the following:
 L<Config::General|Config::General>