From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 25 May 2016 10:54:31 +0000 (+0200)
Subject: Couple things forgotten during 399b9455/b46b8537
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=95b76469a363174145245b3490ebba83d1b639ce;p=dbsrgits%2FDBIx-Class.git

Couple things forgotten during 399b9455/b46b8537
---

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index c12a343..a4b8654 100644
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -1,5 +1,8 @@
 package DBIx::Class;
 
+# important to load early
+use DBIx::Class::_Util;
+
 use strict;
 use warnings;
 
@@ -15,11 +18,9 @@ $VERSION = '0.082899_15';
 
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
-use DBIx::Class::_Util;
 use mro 'c3';
 
 use base qw/DBIx::Class::Componentised DBIx::Class::AccessorGroup/;
-use DBIx::Class::StartupCheck;
 use DBIx::Class::Exception;
 
 __PACKAGE__->mk_group_accessors(inherited => '_skip_namespace_frames');
diff --git a/lib/DBIx/Class/StartupCheck.pm b/lib/DBIx/Class/StartupCheck.pm
index 986e452..7a44a4b 100644
--- a/lib/DBIx/Class/StartupCheck.pm
+++ b/lib/DBIx/Class/StartupCheck.pm
@@ -17,7 +17,10 @@ BEGIN {
         . "Unable to continue - a part of the bundled templib contents "
         . "was already loaded (likely an older version from CPAN). "
         . "Make sure that @{[ __PACKAGE__ ]} is loaded before $_\n"
-        . "\n\tThis *WILL NOT* be necessary for the official DBIC release\n\n"
+        . "\nUsually it is sufficient to add PERL5OPT=\"-M@{[ __PACKAGE__ ]}\" "
+        . "to your environment in order to resolve this problem\n"
+        . "\n\tThis is temporary and *WILL NOT* be necessary for the official "
+        . "DBIC release\n\n"
       ;
     }
   }