X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FGeneral.pm;h=bae5fff5041216ae4f6533d80d04312e23c55cf1;hp=76b04a9a5ad93a5c81157f862a17b85c9a92360b;hb=a918b0b8b7952db918dfabb8dc72bf34832d43d0;hpb=f0e3c2214342d0d8a8839009b8b9c7e6bfbc7ab2 diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm index 76b04a9..bae5fff 100644 --- a/lib/Config/Any/General.pm +++ b/lib/Config/Any/General.pm @@ -40,14 +40,17 @@ Attempts to load C<$file> via Config::General. sub load { my $class = shift; my $file = shift; + my $args = shift || {}; # work around bug (?) in Config::General -# return if $class->_test_perl($file); + # return if $class->_test_perl($file); + + $args->{ -ConfigFile } = $file; require Config::General; - my $configfile = Config::General->new( $file ); + my $configfile = Config::General->new( %$args ); my $config = { $configfile->getall }; - + return $config; } @@ -58,32 +61,24 @@ sub load { # developer. sub _test_perl { - my ($class, $file) = @_; + my ( $class, $file ) = @_; my $is_perl_src; eval { $is_perl_src = do "$file"; }; - delete $INC{$file}; # so we don't screw stuff later on + delete $INC{ $file }; # so we don't screw stuff later on return defined $is_perl_src; } =head1 AUTHOR -=over 4 - -=item * Brian Cassidy Ebricas@cpan.orgE - -=back +Brian Cassidy Ebricas@cpan.orgE =head1 CONTRIBUTORS -=over 4 - -=item * Joel Bernstein C<< >> - -=back +Joel Bernstein C<< >> =head1 COPYRIGHT AND LICENSE -Copyright 2006 by Brian Cassidy +Copyright 2007 by Brian Cassidy Portions Copyright 2006 Portugal Telecom