X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=59b00812474e3c60f163facb4c815be2d98f8b82;hb=70c288086248e5a4008490df22a56632341f2473;hp=c7640dab6bfa2cdddbe36b8d8589587092ed7431;hpb=f33862043c4b1e9f5823bc407585b43582dbcd5a;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm index c7640da..59b0081 100644 --- a/lib/DBIx/Class/Admin.pm +++ b/lib/DBIx/Class/Admin.pm @@ -2,9 +2,8 @@ package DBIx::Class::Admin; # check deps BEGIN { - use Carp::Clan qw/^DBIx::Class/; use DBIx::Class; - croak('The following modules are required for DBIx::Class::Admin ' . DBIx::Class::Optional::Dependencies->req_missing_for ('admin') ) + die('The following modules are required for DBIx::Class::Admin ' . DBIx::Class::Optional::Dependencies->req_missing_for ('admin') ) unless DBIx::Class::Optional::Dependencies->req_ok_for ('admin'); } @@ -324,7 +323,7 @@ sub _trigger_trace { =back -L will generate sql for the supplied schema_class in sql_dir. The +C will generate sql for the supplied schema_class in sql_dir. The flavour of sql to generate can be controlled by supplying a sqlt_type which should be a L name. @@ -403,7 +402,7 @@ sub install { print "return is $ret\n" if (!$self->quiet); } elsif ($schema->get_db_version() and $self->force ) { - carp "Forcing install may not be a good idea"; + warn "Forcing install may not be a good idea\n"; if($self->_confirm() ) { $self->schema->_set_db_version({ version => $version}); }