diff --git a/Netdisco/Changes b/Netdisco/Changes index 18fd0d7a..07025b6c 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,3 +1,10 @@ +2.029013 - + + [BUG FIXES] + + * Fix for latest DBIx::Class (deploy) + * Fix for latest Dancer (YAML::XS) + 2.029012 - 2014-10-09 [BUG FIXES] diff --git a/Netdisco/META.yml b/Netdisco/META.yml index 9050e21a..d06d270b 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -7,6 +7,7 @@ build_requires: ExtUtils::MakeMaker: 6.59 Test::More: 0.88 configure_requires: + DBIx::Class: 0.082801 ExtUtils::MakeMaker: 6.59 distribution_type: module dynamic_config: 1 @@ -35,8 +36,8 @@ requires: Archive::Extract: 0 CGI::Expand: 2.05 DBD::Pg: 0 - DBIx::Class: 0.0827 - DBIx::Class::Helpers: 2.018004 + DBIx::Class: 0.082801 + DBIx::Class::Helpers: 2.023007 Daemon::Control: 0.001 Dancer: 1.3131_1 Dancer::Plugin::Auth::Extensible: 0.3 @@ -67,7 +68,7 @@ requires: Plack::Middleware::ReverseProxy: 0.15 Role::Tiny: 1.002005 SNMP::Info: 3.18 - SQL::Translator: 0.11016 + SQL::Translator: 0.11018 Sereal: 0 Socket6: 0.23 Starman: 0.4008 diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL index 4d8ecd3c..b4a63df6 100644 --- a/Netdisco/Makefile.PL +++ b/Netdisco/Makefile.PL @@ -16,8 +16,8 @@ requires 'Archive::Extract' => 0; requires 'CGI::Expand' => 2.05; requires 'Data::Printer' => 0; requires 'DBD::Pg' => 0; -requires 'DBIx::Class' => 0.08270; -requires 'DBIx::Class::Helpers' => 2.018004; +requires 'DBIx::Class' => 0.082801; +requires 'DBIx::Class::Helpers' => 2.023007; requires 'Daemon::Control' => 0.001000; requires 'Dancer' => '1.3131_1'; requires 'Dancer::Plugin::DBIC' => 0.2001; @@ -50,7 +50,6 @@ requires 'Sereal' => 0; requires 'Socket6' => 0.23; requires 'Starman' => 0.4008; requires 'SNMP::Info' => 3.18; -requires 'SQL::Translator' => 0.11016; requires 'Template' => 2.24; requires 'Template::Plugin::CSV' => 0.04; requires 'Template::Plugin::Number::Format' => 1.02; @@ -68,6 +67,14 @@ if ( $^O eq 'linux' ) { requires 'Sys::Proctitle' => 0; } +configure_requires 'DBIx::Class' => '0.082801'; +require DBIx::Class::Optional::Dependencies; + +my $deploy_deps = DBIx::Class::Optional::Dependencies->req_list_for('deploy'); +foreach my $k (keys %$deploy_deps) { + requires $k => $deploy_deps->{$k}; +} + recommends 'Graph' => 0; recommends 'GraphViz' => 0; recommends 'Net::OpenSSH' => 0; diff --git a/Netdisco/bin/netdisco-db-deploy b/Netdisco/bin/netdisco-db-deploy index 8e774626..77875807 100755 --- a/Netdisco/bin/netdisco-db-deploy +++ b/Netdisco/bin/netdisco-db-deploy @@ -85,7 +85,7 @@ my $schema = schema('netdisco'); # installs the dbix_class_schema_versions table with version "1" # which corresponds to an empty schema if (not $schema->get_db_version) { - $schema->txn_do(sub { $schema->install(1) }); + $schema->install(1); $schema->storage->disconnect; }