From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 26 Jan 2011 11:37:50 +0000 (+0100)
Subject: Correct Makefile.PL authortests borkage
X-Git-Tag: v0.08191~104
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c5e9d46d06640866b0594439d1f4affa0b5f5346;p=dbsrgits%2FDBIx-Class.git

Correct Makefile.PL authortests borkage

Fix last-resort error message and do an explicit require (though
it should *not* be necessary people broke it somehow)
---

diff --git a/Makefile.PL b/Makefile.PL
index e44489b..2a196bc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -193,14 +193,20 @@ tests_recursive (qw|
 # temporary(?) until I get around to fix M::I wrt xt/
 # needs Module::Install::AuthorTests
 eval {
+  # this should not be necessary since the autoloader is supposed
+  # to work, but there were reports of it failing
+  require Module::Install::AuthorTests;
   recursive_author_tests (qw/xt/);
   1;
 } || do {
   if ($Module::Install::AUTHOR && ! $args->{skip_author_deps}) {
     my $err = $@;
+
+    # better error message in case of missing dep
     eval { require Module::Install::AuthorTests }
       || die "\nYou need Module::Install::AuthorTests installed to run this Makefile.PL in author mode (or supply --skip_author_deps):\n\n$@\n";
-    die $@;
+
+    die $err;
   }
 };