[Bast-commits] r8185 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-12-30 17:30:58 +0000 (Wed, 30 Dec 2009)
New Revision: 8185

Modified:
   branches/DBIx-Class-Schema-Loader/current/Makefile.PL
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
Log:
bump File::Path dep, fixup redefined warning handler

Modified: branches/DBIx-Class-Schema-Loader/current/Makefile.PL
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-12-30 03:34:04 UTC (rev 8184)
+++ branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-12-30 17:30:58 UTC (rev 8185)
@@ -6,7 +6,7 @@
 test_requires 'Test::More'    => '0.94';
 test_requires 'DBI'           => '1.56';
 test_requires 'DBD::SQLite'   => '1.12';
-test_requires 'File::Path'    => 0;
+test_requires 'File::Path'    => '2.07';
 test_requires 'IPC::Open3'    => 0;
 test_requires 'Test::Exception';
 

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2009-12-30 03:34:04 UTC (rev 8184)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2009-12-30 17:30:58 UTC (rev 8185)
@@ -518,8 +518,10 @@
 
         if ($self->dynamic) { # load the class too
             # kill redefined warnings
+            my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
             local $SIG{__WARN__} = sub {
-                warn @_ unless $_[0] =~ /^Subroutine \S+ redefined/;
+                $warn_handler->(@_)
+                    unless $_[0] =~ /^Subroutine \S+ redefined/;
             };
             do $real_inc_path;
             die $@ if $@;
@@ -545,8 +547,10 @@
 new name of the Result.
 EOF
             # kill redefined warnings
+            my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
             local $SIG{__WARN__} = sub {
-                warn @_ unless $_[0] =~ /^Subroutine \S+ redefined/;
+                $warn_handler->(@_)
+                    unless $_[0] =~ /^Subroutine \S+ redefined/;
             };
             my $code = do {
                 local ($/, @ARGV) = (undef, $old_real_inc_path); <>
@@ -736,10 +740,11 @@
     delete $INC{ $class_path };
 
 # kill redefined warnings
+    my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
     local $SIG{__WARN__} = sub {
-        warn @_ unless $_[0] =~ /^Subroutine \S+ redefined/;
+        $warn_handler->(@_)
+            unless $_[0] =~ /^Subroutine \S+ redefined/;
     };
-
     eval "require $class;";
 }