diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-03-12 19:07:08 +0000 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-03-12 19:07:08 +0000 |
| commit | 5de76f77f9afda16fc840c850db9046aca32d01d (patch) | |
| tree | 52596e8dff6d97cd93234853b9bac21e110a0d65 /perl-external | |
| parent | 56636b86c2f1e0778c7ba742fd4eeaa7a1ac8bf6 (diff) | |
More fixups and modules
Diffstat (limited to 'perl-external')
| -rwxr-xr-x | perl-external/bin/module-manage.pl | 16 | ||||
| -rw-r--r-- | perl-external/minicpan/modules/02packages.details.txt.gz | bin | 12094 -> 12094 bytes | |||
| -rw-r--r-- | perl-external/modules.txt | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/perl-external/bin/module-manage.pl b/perl-external/bin/module-manage.pl index 26fa09258..0351354f5 100755 --- a/perl-external/bin/module-manage.pl +++ b/perl-external/bin/module-manage.pl @@ -42,7 +42,8 @@ sub init { sub setup { fetch_all(); - init(); + build('App::cpanminus'); + build('MyCPAN::App::DPAN'); build_all(); } @@ -52,7 +53,8 @@ sub add { # try to install the distribution using cpanm my $out = ''; my $cmd = "cpanm --reinstall $module"; - print " running '$cmd'\n"; + + # print " running '$cmd'\n"; run3( $cmd, undef, \$out, \$out ) || die "Error running '$cmd'"; @@ -102,7 +104,7 @@ sub build { my $out = ''; my $cmd = "cpanm --mirror $minicpan --mirror-only $module"; - print " running '$cmd'\n"; + # print " running '$cmd'\n"; run3( $cmd, undef, \$out, \$out ) || die "Error running '$cmd'"; @@ -112,9 +114,10 @@ sub build { split /\n+/, $out; my $last_line = $lines[-1]; - die "Error building '$module':\n\n$out\n\n" + die "Error building '$module':\n\n$last_line\n\n$out\n\n" unless $last_line =~ m{Successfully installed } - || $last_line =~ m{is up to date}; + || $last_line =~ m{is up to date} + || $last_line =~ m{\d+ distributions? installed}; } sub fetch_all { @@ -131,7 +134,8 @@ sub fetch { return if -e $destination; - print " $url\n -> $destination\n"; + print " Fetching $url\n"; + print " -> $destination\n"; is_success( getstore( $url, "$destination" ) ) || die "Error saving $url to $destination"; diff --git a/perl-external/minicpan/modules/02packages.details.txt.gz b/perl-external/minicpan/modules/02packages.details.txt.gz Binary files differindex b288a2d6a..22b3a84c7 100644 --- a/perl-external/minicpan/modules/02packages.details.txt.gz +++ b/perl-external/minicpan/modules/02packages.details.txt.gz diff --git a/perl-external/modules.txt b/perl-external/modules.txt index 246bb9100..7f9f0631b 100644 --- a/perl-external/modules.txt +++ b/perl-external/modules.txt @@ -1,4 +1,5 @@ App::cpanminus +Bundle::DBD::Pg Catalyst Catalyst::Action::RenderView Catalyst::Authentication::Store::DBIx::Class @@ -11,7 +12,6 @@ Catalyst::Plugin::Static::Simple Catalyst::Runtime Catalyst::View::TT Config::General -DBD::Pg DBIx::Class Email::Send Email::Simple @@ -21,6 +21,7 @@ HTTP::Server::Simple::CGI IO::String Moose MyCPAN::App::DPAN +namespace::autoclean Net::Domain::TLD Path::Class RABX @@ -28,4 +29,3 @@ Readonly Sub::Override Test::More Test::WWW::Mechanize::Catalyst -namespace::autoclean |