135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for latest DBIx::Class (deploy)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-10-19 13:46:41 +01:00
parent 8d51e69563
commit e72bfa750e
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Netdisco/Changes
View File

@@ -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 2.029012 - 2014-10-09
[BUG FIXES] [BUG FIXES]

7
Netdisco/META.yml
View File

@@ -7,6 +7,7 @@ build_requires:
ExtUtils::MakeMaker: 6.59 ExtUtils::MakeMaker: 6.59
Test::More: 0.88 Test::More: 0.88
configure_requires: configure_requires:
DBIx::Class: 0.082801
ExtUtils::MakeMaker: 6.59 ExtUtils::MakeMaker: 6.59
distribution_type: module distribution_type: module
dynamic_config: 1 dynamic_config: 1
@@ -35,8 +36,8 @@ requires:
Archive::Extract: 0 Archive::Extract: 0
CGI::Expand: 2.05 CGI::Expand: 2.05
DBD::Pg: 0 DBD::Pg: 0
DBIx::Class: 0.0827 DBIx::Class: 0.082801
DBIx::Class::Helpers: 2.018004 DBIx::Class::Helpers: 2.023007
Daemon::Control: 0.001 Daemon::Control: 0.001
Dancer: 1.3131_1 Dancer: 1.3131_1
Dancer::Plugin::Auth::Extensible: 0.3 Dancer::Plugin::Auth::Extensible: 0.3
@@ -67,7 +68,7 @@ requires:
Plack::Middleware::ReverseProxy: 0.15 Plack::Middleware::ReverseProxy: 0.15
Role::Tiny: 1.002005 Role::Tiny: 1.002005
SNMP::Info: 3.18 SNMP::Info: 3.18
SQL::Translator: 0.11016 SQL::Translator: 0.11018
Sereal: 0 Sereal: 0
Socket6: 0.23 Socket6: 0.23
Starman: 0.4008 Starman: 0.4008

13
Netdisco/Makefile.PL
View File

@@ -16,8 +16,8 @@ requires 'Archive::Extract' => 0;
requires 'CGI::Expand' => 2.05; requires 'CGI::Expand' => 2.05;
requires 'Data::Printer' => 0; requires 'Data::Printer' => 0;
requires 'DBD::Pg' => 0; requires 'DBD::Pg' => 0;
requires 'DBIx::Class' => 0.08270; requires 'DBIx::Class' => 0.082801;
requires 'DBIx::Class::Helpers' => 2.018004; requires 'DBIx::Class::Helpers' => 2.023007;
requires 'Daemon::Control' => 0.001000; requires 'Daemon::Control' => 0.001000;
requires 'Dancer' => '1.3131_1'; requires 'Dancer' => '1.3131_1';
requires 'Dancer::Plugin::DBIC' => 0.2001; requires 'Dancer::Plugin::DBIC' => 0.2001;
@@ -50,7 +50,6 @@ requires 'Sereal' => 0;
requires 'Socket6' => 0.23; requires 'Socket6' => 0.23;
requires 'Starman' => 0.4008; requires 'Starman' => 0.4008;
requires 'SNMP::Info' => 3.18; requires 'SNMP::Info' => 3.18;
requires 'SQL::Translator' => 0.11016;
requires 'Template' => 2.24; requires 'Template' => 2.24;
requires 'Template::Plugin::CSV' => 0.04; requires 'Template::Plugin::CSV' => 0.04;
requires 'Template::Plugin::Number::Format' => 1.02; requires 'Template::Plugin::Number::Format' => 1.02;
@@ -68,6 +67,14 @@ if ( $^O eq 'linux' ) {
requires 'Sys::Proctitle' => 0; 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 'Graph' => 0;
recommends 'GraphViz' => 0; recommends 'GraphViz' => 0;
recommends 'Net::OpenSSH' => 0; recommends 'Net::OpenSSH' => 0;

2
Netdisco/bin/netdisco-db-deploy
View File

@@ -85,7 +85,7 @@ my $schema = schema('netdisco');
# installs the dbix_class_schema_versions table with version "1" # installs the dbix_class_schema_versions table with version "1"
# which corresponds to an empty schema # which corresponds to an empty schema
if (not $schema->get_db_version) { if (not $schema->get_db_version) {
$schema->txn_do(sub { $schema->install(1) }); $schema->install(1);
$schema->storage->disconnect; $schema->storage->disconnect;
} }