In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b52cde68813a958007c6d814f1890e762f75c8dc?hp=5eb9f461ffc6ee3b593f727dcbe05bcdc77bde57>
- Log ----------------------------------------------------------------- commit b52cde68813a958007c6d814f1890e762f75c8dc Author: Steve Hay <[email protected]> Date: Mon Oct 7 08:53:10 2013 +0100 Upgrade podlators from 2.5.2 to 2.5.3. M Porting/Maintainers.pl M cpan/podlators/VERSION M cpan/podlators/lib/Pod/Man.pm M cpan/podlators/lib/Pod/Text.pm M cpan/podlators/t/man-empty.t M cpan/podlators/t/text-empty.t M pod/perldelta.pod commit d477c82bf8b8c629be2915335abd4358a5bd0132 Author: Steve Hay <[email protected]> Date: Mon Oct 7 08:52:13 2013 +0100 Upgrade Module-Metadata from version 1.000018 to 1.000019 M Porting/Maintainers.pl M cpan/Module-Metadata/lib/Module/Metadata.pm M cpan/Module-Metadata/t/metadata.t M pod/perldelta.pod ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 4 ++-- cpan/Module-Metadata/lib/Module/Metadata.pm | 3 ++- cpan/Module-Metadata/t/metadata.t | 6 ++++++ cpan/podlators/VERSION | 2 +- cpan/podlators/lib/Pod/Man.pm | 2 +- cpan/podlators/lib/Pod/Text.pm | 2 +- cpan/podlators/t/man-empty.t | 22 +++++++++++++++++----- cpan/podlators/t/text-empty.t | 14 ++++++++++++-- pod/perldelta.pod | 8 +++++++- 9 files changed, 49 insertions(+), 14 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 6ad35ff..ff826a1 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1072,7 +1072,7 @@ use File::Glob qw(:case); }, 'Module::Metadata' => { - 'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000018.tar.gz', + 'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000019.tar.gz', 'FILES' => q[cpan/Module-Metadata], 'EXCLUDED' => [ qr{^maint}, @@ -1324,7 +1324,7 @@ use File::Glob qw(:case); }, 'podlators' => { - 'DISTRIBUTION' => 'RRA/podlators-2.5.2.tar.gz', + 'DISTRIBUTION' => 'RRA/podlators-2.5.3.tar.gz', 'FILES' => q[cpan/podlators pod/perlpodstyle.pod], # The perl distribution has pod2man.PL and pod2text.PL, which are diff --git a/cpan/Module-Metadata/lib/Module/Metadata.pm b/cpan/Module-Metadata/lib/Module/Metadata.pm index a92d05f..e352d31 100644 --- a/cpan/Module-Metadata/lib/Module/Metadata.pm +++ b/cpan/Module-Metadata/lib/Module/Metadata.pm @@ -12,7 +12,7 @@ package Module::Metadata; use strict; use warnings; -our $VERSION = '1.000018'; +our $VERSION = '1.000019'; $VERSION = eval $VERSION; use Carp qw/croak/; @@ -654,6 +654,7 @@ sub _evaluate_version_line { #; package Module::Metadata::_version::p$pn; use version; no strict; + no warnings; \$vsub = sub { local $sigil$var; diff --git a/cpan/Module-Metadata/t/metadata.t b/cpan/Module-Metadata/t/metadata.t index 20e6440..2c2eb9e 100644 --- a/cpan/Module-Metadata/t/metadata.t +++ b/cpan/Module-Metadata/t/metadata.t @@ -210,6 +210,12 @@ package Simple v1.2.3_4 { 1; } --- + '0' => <<'---', # set from separately-initialised variable +package Simple; + our $CVSVERSION = '$Revision: 1.7 $'; + our ($VERSION) = ($CVSVERSION =~ /(\d+\.\d+)/); +} +--- ); my %modules = reverse @modules; diff --git a/cpan/podlators/VERSION b/cpan/podlators/VERSION index 492e415..4c07313 100644 --- a/cpan/podlators/VERSION +++ b/cpan/podlators/VERSION @@ -1 +1 @@ -$VERSION = '2.5.2'; +$VERSION = '2.5.3'; diff --git a/cpan/podlators/lib/Pod/Man.pm b/cpan/podlators/lib/Pod/Man.pm index 39ff7f5..72ca9ff 100644 --- a/cpan/podlators/lib/Pod/Man.pm +++ b/cpan/podlators/lib/Pod/Man.pm @@ -1640,7 +1640,7 @@ not to throw an exception. C<pod> says to include a POD ERRORS section in the resulting documentation summarizing the errors. C<none> ignores POD errors entirely, as much as possible. -The default is C<output>. +The default is C<pod>. =item date diff --git a/cpan/podlators/lib/Pod/Text.pm b/cpan/podlators/lib/Pod/Text.pm index ed95591..87f9e81 100644 --- a/cpan/podlators/lib/Pod/Text.pm +++ b/cpan/podlators/lib/Pod/Text.pm @@ -808,7 +808,7 @@ not to throw an exception. C<pod> says to include a POD ERRORS section in the resulting documentation summarizing the errors. C<none> ignores POD errors entirely, as much as possible. -The default is C<output>. +The default is C<pod>. =item indent diff --git a/cpan/podlators/t/man-empty.t b/cpan/podlators/t/man-empty.t index 8ba97df..1e094c8 100644 --- a/cpan/podlators/t/man-empty.t +++ b/cpan/podlators/t/man-empty.t @@ -27,16 +27,28 @@ isa_ok ($parser, 'Pod::Man'); my $output; $parser->output_string (\$output); -# Try a POD document where the only command is invalid. +# Try a POD document where the only command is invalid. With recent +# Pod::Simple, there will be a POD ERRORS section. With older versions of +# Pod::Simple, we have to skip the test since it doesn't trigger this problem. +# Be sure that we don't get any warnings as well as any errors. +local $SIG{__WARN__} = sub { die $_[0] }; ok (eval { $parser->parse_string_document("=\xa0") }, 'Parsed invalid document'); is ($@, '', '...with no errors'); -like ($output, qr{\.SH \"POD ERRORS\"}, - '...and output contains a POD ERRORS section'); +SKIP: { + skip 'Pod::Simple does not produce errors for invalid commands', 1 + if $output eq q{}; + like ($output, qr{\.SH \"POD ERRORS\"}, + '...and output contains a POD ERRORS section'); +} # Try with a document containing only =cut. ok (eval { $parser->parse_string_document("=cut") }, 'Parsed invalid document'); is ($@, '', '...with no errors'); -like ($output, qr{\.SH \"POD ERRORS\"}, - '...and output contains a POD ERRORS section'); +SKIP: { + skip 'Pod::Simple does not produce errors for invalid commands', 1 + if $output eq q{}; + like ($output, qr{\.SH \"POD ERRORS\"}, + '...and output contains a POD ERRORS section'); +} diff --git a/cpan/podlators/t/text-empty.t b/cpan/podlators/t/text-empty.t index 0a4c66a..2164a75 100644 --- a/cpan/podlators/t/text-empty.t +++ b/cpan/podlators/t/text-empty.t @@ -33,10 +33,20 @@ local $SIG{__WARN__} = sub { die $_[0] }; ok (eval { $parser->parse_string_document("=\xa0") }, 'Parsed invalid document'); is ($@, '', '...with no errors'); -like ($output, qr{POD ERRORS}, '...and output contains a POD ERRORS section'); +SKIP: { + skip 'Pod::Simple does not produce errors for invalid commands', 1 + if $output eq q{}; + like ($output, qr{POD ERRORS}, + '...and output contains a POD ERRORS section'); +} # Try with a document containing only =cut. ok (eval { $parser->parse_string_document("=cut") }, 'Parsed invalid document'); is ($@, '', '...with no errors'); -like ($output, qr{POD ERRORS}, '...and output contains a POD ERRORS section'); +SKIP: { + skip 'Pod::Simple does not produce errors for invalid commands', 1 + if $output eq q{}; + like ($output, qr{POD ERRORS}, + '...and output contains a POD ERRORS section'); +} diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 9c8531b..eb8e5a3 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -173,7 +173,13 @@ The list of Perl versions covered has been updated. =item * -The podlators modules have been upgraded from version 2.5.1 to 2.5.2. +L<Module::Metadata> has been upgraded from version 1.000018 to 1.000019. + +Warnings are now disabled during version evaluation. + +=item * + +The podlators modules have been upgraded from version 2.5.1 to 2.5.3. Numerous updates and bug fixes are incorporated. See the F<Changes> file in the CPAN distribution for full details. -- Perl5 Master Repository
