[Bast-commits] r8682 - in DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class: . Optional

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-02-13 09:34:19 +0000 (Sat, 13 Feb 2010)
New Revision: 8682

Modified:
   DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm
   DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
Log:
We use Try::Tiny in a single spot, not grounds for inlusion in deps

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm	2010-02-13 09:28:04 UTC (rev 8681)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm	2010-02-13 09:34:19 UTC (rev 8682)
@@ -244,8 +244,10 @@
 
 sub _build_config {
   my ($self) = @_;
-  try { require Config::Any } catch { $self->throw_exception( "Config::Any is required to parse the config file"); };
 
+  eval { require Config::Any }
+    or $self->throw_exception( "Config::Any is required to parse the config file");
+
   my $cfg = Config::Any->load_files ( {files => [$self->config_file], use_ext =>1, flatten_to_hash=>1});
 
   # just grab the config from the config file

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm	2010-02-13 09:28:04 UTC (rev 8681)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm	2010-02-13 09:34:19 UTC (rev 8682)
@@ -38,7 +38,6 @@
       %$moose_basic,
       'MooseX::Types::Path::Class'=> '0.05',
       'MooseX::Types::JSON'       => '0.02',
-      'Try::Tiny'                 => '0.02',
       'namespace::autoclean'      => '0.09',
       'parent'                    => '0.223',
       'Getopt::Long::Descriptive' => '0.081',