From: Matt S Trout <mst@shadowcat.co.uk>
Date: Fri, 20 Feb 2009 08:22:47 +0000 (+0000)
Subject: Merge 'multi_stuff' into 'trunk'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dfb45ec431de0598c0222aa067b9b9380143d7f8;hp=-c;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'multi_stuff' into 'trunk'
---

dfb45ec431de0598c0222aa067b9b9380143d7f8
diff --combined Changes
index 9d7887b,9d7887b..a068719
--- a/Changes
+++ b/Changes
@@@ -23,6 -23,6 +23,7 @@@ Revision history for DBIx::Clas
          - PG array datatype supported with SQLA >= 1.50
          - insert should use store_column, not set_column to avoid marking
            clean just-stored values as dirty. New test for this (groditi)
++        - regression test for source_name (groditi)
  
  0.08099_05 2008-10-30 21:30:00 (UTC)
          - Rewritte of Storage::DBI::connect_info(), extended with an
diff --combined Makefile.PL
index 1a3466f,f590d45..38a89db
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -1,7 -1,6 +1,7 @@@
  use inc::Module::Install 0.67;
  use strict;
  use warnings;
 +use POSIX ();
  
  use 5.006001; # delete this line if you want to send patches for earlier.
  
@@@ -26,6 -25,7 +26,7 @@@ requires 'Scope::Guard'              =
  requires 'Path::Class'               => 0;
  requires 'List::Util'                => 1.19;
  requires 'Sub::Name'                 => 0.04;
+ requires 'namespace::clean'          => 0.09;
  
  # Perl 5.8.0 doesn't have utf8::is_utf8()
  requires 'Encode'                    => 0 if ($] <= 5.008000);  
@@@ -119,14 -119,9 +120,14 @@@ EO
        exit 0;
    }
    else {
 -      wait();
 +      eval {
 +          local $SIG{ALRM} = sub { die "timeout\n" };
 +          alarm 5;
 +          wait();
 +          alarm 0;
 +      };
        my $sig = $? & 127;
 -      if ($sig == 11) {
 +      if ($@ || $sig == POSIX::SIGSEGV) {
            warn (<<EOE);
  
  ############################### WARNING #################################