In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f318c24d5fe0afd05d6f929510f6e068ea7f7fc7?hp=04a2c3d983bd747e36e82c5d52cd4af7878e8d9f>
- Log ----------------------------------------------------------------- commit f318c24d5fe0afd05d6f929510f6e068ea7f7fc7 Author: Chris 'BinGOs' Williams <[email protected]> Date: Wed Dec 5 16:27:15 2012 +0000 Synchronise CPAN Locale-Maketest and core version M Porting/Maintainers.pl M dist/Locale-Maketext/ChangeLog commit 5a2ec0aae98463a411132f911bf30d196ea4fa55 Author: Chris 'BinGOs' Williams <[email protected]> Date: Wed Dec 5 16:25:26 2012 +0000 Update CPANPLUS-Dist-Build to CPAN version 0.68 [DELTA] 0.68 Wed Dec 5 00:17:04 GMT 2012 - Revert change to wrapper command-line 0.66 Tue Dec 4 23:05:53 GMT 2012 - Resolve an issue where Build.PL doesn't generate a Build script M Porting/Maintainers.pl M cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm M cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 4 ++-- .../CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm | 11 ++++++++++- .../lib/CPANPLUS/Dist/Build/Constants.pm | 2 +- dist/Locale-Maketext/ChangeLog | 3 +++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 6949807..7ca98be 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -474,7 +474,7 @@ use File::Glob qw(:case); 'CPANPLUS::Dist::Build' => { 'MAINTAINER' => 'bingos', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.64.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-Dist-Build-0.68.tar.gz', 'FILES' => q[cpan/CPANPLUS-Dist-Build], 'EXCLUDED' => [ qr{^inc/}, @@ -1116,7 +1116,7 @@ use File::Glob qw(:case); 'Locale::Maketext' => { 'MAINTAINER' => 'ferreira', - 'DISTRIBUTION' => 'TODDR/Locale-Maketext-1.22.tar.gz', + 'DISTRIBUTION' => 'TODDR/Locale-Maketext-1.23.tar.gz', 'FILES' => q[dist/Locale-Maketext], 'EXCLUDED' => [ qw( diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm index c26e379..7669937 100644 --- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm +++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm @@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; local $Params::Check::VERBOSE = 1; -$VERSION = '0.64'; +$VERSION = '0.68'; =pod @@ -327,6 +327,15 @@ sub prepare { $fail++; last RUN; } + unless ( BUILD->( $dir ) ) { + error( loc( "Build.PL failed to generate a Build script: %1", $prep_output ) ); + if ( $conf->get_conf('cpantest') ) { + $status->{stage} = 'prepare'; + $status->{capture} = $prep_output; + } + $fail++; last RUN; + } + msg( $prep_output, 0 ); my $prereqs = $self->status->prereqs; diff --git a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm index f7b514d..5aff878 100644 --- a/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm +++ b/cpan/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build/Constants.pm @@ -9,7 +9,7 @@ BEGIN { require Exporter; use vars qw[$VERSION @ISA @EXPORT]; - $VERSION = '0.64'; + $VERSION = '0.68'; @ISA = qw[Exporter]; @EXPORT = qw[ BUILD_DIR BUILD CPDB_PERL_WRAPPER]; } diff --git a/dist/Locale-Maketext/ChangeLog b/dist/Locale-Maketext/ChangeLog index 89533bd..aaa0eb8 100644 --- a/dist/Locale-Maketext/ChangeLog +++ b/dist/Locale-Maketext/ChangeLog @@ -1,5 +1,8 @@ Revision history for Perl suite Locale::Maketext +2012-12-04 + * Fix misparsing of maketext strings. + 2012-11-22 * Fix hash order dependcy bug in tests -- Perl5 Master Repository
