X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStartupCheck.pm;h=17ca65f7930d8f74bc59162a47c5f3c52680a4a1;hp=7a44a4baf21d6dfb6b19c730f0558f0b5cfd8c51;hb=12a184d0a0c1868708e43aaabefe08f9e7ac9ec4;hpb=6c7ca96253b07f8ac9b6940ac35368d25ed3b139 diff --git a/lib/DBIx/Class/StartupCheck.pm b/lib/DBIx/Class/StartupCheck.pm index 7a44a4b..17ca65f 100644 --- a/lib/DBIx/Class/StartupCheck.pm +++ b/lib/DBIx/Class/StartupCheck.pm @@ -1,40 +1,7 @@ package DBIx::Class::StartupCheck; -# Temporary - tempextlib use warnings; use strict; -use namespace::clean; -BEGIN { - # There can be only one of these, make sure we get the bundled part and - # *not* something off the site lib - for (qw( - Sub::Quote - )) { - (my $incfn = "$_.pm") =~ s|::|/|g; - - if ($INC{$incfn}) { - die "\n\t*TEMPORARY* TRIAL RELEASE REQUIREMENTS VIOLATED\n\n" - . "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" - . "\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" - ; - } - } - - require File::Spec; - our ($HERE) = File::Spec->rel2abs( - File::Spec->catdir( (File::Spec->splitpath(__FILE__))[1], '_TempExtlib' ) - ) =~ /^(.*)$/; # screw you, taint mode - - die "TempExtlib $HERE does not seem to exist - perhaps you need to run `perl Makefile.PL` in the DBIC checkout?\n" - unless -d $HERE; - - unshift @INC, $HERE; -} 1;