In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/9a7aaf5783774d0974f8e80c4d6572d213f7fd92?hp=bfc60ea21e7aaed22d534045f4097593ec21898a>
- Log ----------------------------------------------------------------- commit 9a7aaf5783774d0974f8e80c4d6572d213f7fd92 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sun Aug 31 14:52:18 2014 +0100 Update ExtUtils-Manifest to CPAN version 1.66 [DELTA] 1.66 Sun, Aug 31, 2014 - manifind() will now follow symlinks - Tests fixed if PERL_MM_MANIFEST_VERBOSE env var is set to false value - Fixed bug with maniread()'s handling of quoted filenames ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm | 6 +++--- cpan/ExtUtils-Manifest/t/Manifest.t | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e31fe31..c124598 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -485,7 +485,7 @@ use File::Glob qw(:case); }, 'ExtUtils::Manifest' => { - 'DISTRIBUTION' => 'BINGOS/ExtUtils-Manifest-1.65.tar.gz', + 'DISTRIBUTION' => 'BINGOS/ExtUtils-Manifest-1.66.tar.gz', 'FILES' => q[cpan/ExtUtils-Manifest], 'EXCLUDED' => [qr(^xt/)], }, diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm index 1761589..6e0e838 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm +++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm @@ -10,7 +10,7 @@ use Carp; use strict; use warnings; -our $VERSION = '1.65'; +our $VERSION = '1.66'; our @ISA = ('Exporter'); our @EXPORT_OK = qw(mkmanifest manicheck filecheck fullcheck skipcheck @@ -195,7 +195,7 @@ sub manifind { # $File::Find::name is unavailable. # Also, it's okay to use / here, because MANIFEST files use Unix-style # paths. - find({wanted => $wanted}, + find({wanted => $wanted, follow => 1}, $Is_MacOS ? ":" : "."); return $found; @@ -354,7 +354,7 @@ sub maniread { # filename may contain spaces if enclosed in '' # (in which case, \\ and \' are escapes) - if (($file, $comment) = /^'(\\[\\']|.+)+'\s*(.*)/) { + if (($file, $comment) = /^'((?:\\[\\']|.+)+)'\s*(.*)/) { $file =~ s/\\([\\'])/$1/g; } else { diff --git a/cpan/ExtUtils-Manifest/t/Manifest.t b/cpan/ExtUtils-Manifest/t/Manifest.t index 48e31b9..67cc5a1 100644 --- a/cpan/ExtUtils-Manifest/t/Manifest.t +++ b/cpan/ExtUtils-Manifest/t/Manifest.t @@ -8,12 +8,13 @@ BEGIN { else { unshift @INC, 't/lib'; } + $ENV{PERL_MM_MANIFEST_VERBOSE}=1; } chdir 't'; use strict; -use Test::More tests => 97; +use Test::More tests => 98; use Cwd; use File::Spec; @@ -34,7 +35,6 @@ if ($Is_VMS) { $Is_VMS_noefs = 0 if $vms_efs; } - # 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; @@ -333,6 +333,20 @@ SKIP: { $funky_files{'space_quote_backslash'} = 'foo bar\\baz\'quux'; } +# test including a filename which is itself a quoted string +# https://rt.perl.org/Ticket/Display.html?id=122415 +SKIP: { + my $quoted_filename = q{'quoted name.txt'}; + my $description = "quoted string"; + add_file( $quoted_filename => $description ) + or skip "couldn't create $description test file", 1; + local $ExtUtils::Manifest::MANIFEST = "albatross"; + maniadd({ $quoted_filename => $description }); + is( maniread()->{$quoted_filename}, $description, + 'file whose name starts and ends with quotes' ); + $funky_files{$description} = $quoted_filename; +} + my @funky_keys = qw(space space_quote space_backslash space_quote_backslash); # test including an external manifest.skip file in MANIFEST.SKIP { -- Perl5 Master Repository
