[Catalyst-commits] r11515 - Catalyst-Runtime/5.80/trunk

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-10-12 17:10:32 +0000 (Mon, 12 Oct 2009)
New Revision: 11515

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
Log:
Less cargo cult madness

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-10-12 16:22:08 UTC (rev 11514)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-10-12 17:10:32 UTC (rev 11515)
@@ -1,13 +1,15 @@
 use strict;
 use warnings;
 use inc::Module::Install 0.87;
-BEGIN { # Make it easy for newbies
-    if ($Module::Install::AUTHOR) {
-        require Module::Install::AuthorRequires;
-        require Module::Install::CheckConflicts;
-        require Module::Install::AuthorTests;
-    }
+{   # Ensure that these get used - yes, M::I loads them for us, but if you're
+    # in author mode and don't have them installed, then the error is tres
+    # cryptic.
+    no warnings 'redefine';
+    use Module::Install::AuthorRequires;
+    use Module::Install::CheckConflicts;
+    use Module::Install::AuthorTests;
 }
+
 perl_version '5.008004';
 
 name 'Catalyst-Runtime';