In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/1633525e65fd75604f4ed1aef2e0f776858a1398?hp=b5e20476d6a84607af87913aedb9cb65724747e6>
- Log ----------------------------------------------------------------- commit 1633525e65fd75604f4ed1aef2e0f776858a1398 Author: Karen Etheridge <[email protected]> Date: Sun Mar 10 13:33:58 2019 -0700 upgrade ExtUtils::Manifest from version 1.71 to 1.72 ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP | 9 ++++++--- cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm | 8 ++++---- cpan/ExtUtils-Manifest/t/Manifest.t | 10 +++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 1bff10bda7..f0fbc52ad9 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -476,7 +476,7 @@ use File::Glob qw(:case); }, 'ExtUtils::Manifest' => { - 'DISTRIBUTION' => 'BINGOS/ExtUtils-Manifest-1.71.tar.gz', + 'DISTRIBUTION' => 'ETHER/ExtUtils-Manifest-1.72.tar.gz', 'FILES' => q[cpan/ExtUtils-Manifest], 'EXCLUDED' => [ qr(^t/00-report-prereqs), diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP index 19b17a1c06..72286fdf19 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP +++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP @@ -62,8 +62,11 @@ # Avoid MYMETA files ^MYMETA\. +# Temp files for new META +^META_new\.(?:json|yml) + # Avoid travis-ci.org file -^\.travis.yml +^\.travis\.yml -# Avoid appveyor.com file -^\.appveyor.yml +# Avoid AppVeyor file +^\.?appveyor.yml diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm index 7986f89b4f..201fd36cb9 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm +++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm @@ -1,4 +1,4 @@ -package ExtUtils::Manifest; # git description: 1.70-20-gd0a8273 +package ExtUtils::Manifest; # git description: 1.71-18-g17b7919 require Exporter; use Config; @@ -10,7 +10,7 @@ use Carp; use strict; use warnings; -our $VERSION = '1.71'; +our $VERSION = '1.72'; our @ISA = ('Exporter'); our @EXPORT_OK = qw(mkmanifest manicheck filecheck fullcheck skipcheck @@ -65,7 +65,7 @@ ExtUtils::Manifest - Utilities to write and check a MANIFEST file =head1 VERSION -version 1.71 +version 1.72 =head1 SYNOPSIS @@ -694,7 +694,7 @@ sub maniadd { _fix_manifest($MANIFEST); my $manifest = maniread(); - my @needed = grep { !exists $manifest->{$_} } keys %$additions; + my @needed = grep !exists $manifest->{$_}, keys %$additions; return 1 unless @needed; open(MANIFEST, ">>$MANIFEST") or diff --git a/cpan/ExtUtils-Manifest/t/Manifest.t b/cpan/ExtUtils-Manifest/t/Manifest.t index 856ac82cd7..183786b7f0 100644 --- a/cpan/ExtUtils-Manifest/t/Manifest.t +++ b/cpan/ExtUtils-Manifest/t/Manifest.t @@ -36,7 +36,7 @@ if ($Is_VMS) { # We're going to be chdir'ing and modules are sometimes loaded on the # fly in this test, so we need an absolute @INC. -@INC = map { File::Spec->rel2abs($_) } @INC; +@INC = map File::Spec->rel2abs($_), @INC; # keep track of everything added so it can all be deleted my %Files; @@ -95,7 +95,7 @@ chmod( 0744, 'foo') if $Config{'chmod'}; # there shouldn't be a MANIFEST there my ($res, $warn) = catch_warning( \&mkmanifest ); # Canonize the order. -$warn = join("", map { "$_|" } +$warn = join("", map "$_|", sort { lc($a) cmp lc($b) } split /\r?\n/, $warn); is( $warn, "Added to MANIFEST: foo|Added to MANIFEST: MANIFEST|", "mkmanifest() displayed its additions" ); @@ -165,7 +165,7 @@ find( sub { push @copies, $_ if -f }, 'copy' ); @copies = map { s/\.$//; $_ } @copies if $Is_VMS; # VMS likes to put dots on # the end of files. # Have to compare insensitively for non-case preserving VMS -is_deeply( [sort map { lc } @copies], [sort map { lc } keys %$files] ); +is_deeply( [sort map lc, @copies], [sort map lc, keys %$files] ); # cp would leave files readonly, so check permissions. foreach my $orig (@copies) { @@ -257,7 +257,7 @@ is index($manicontents, "\015\012"), -1, 'MANIFEST no CRLF'; my @lines = split /$eol2/, $content; pop @lines while $lines[-1] eq ""; open my $fh, ">", "MANIFEST" or die "Could not open >MANIFEST: $!"; - print $fh map { "$_$eol" } @lines; + print $fh map "$_$eol", @lines; close $fh or die "Could not close: $!"; last SPLITTER; } @@ -444,7 +444,7 @@ add_file('MANIFEST' => 'Makefile.PL'); maniadd({ foo => 'bar' }); $files = maniread; # VMS downcases the MANIFEST. We normalize it here to match. -%$files = map { (lc $_ => $files->{$_}) } keys %$files; +%$files = map +(lc $_ => $files->{$_}), keys %$files; my %expect = ( 'makefile.pl' => '', 'foo' => 'bar' ); -- Perl5 Master Repository
