Skip to content

Commit 9a7aaf5

Browse files
committed
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
1 parent bfc60ea commit 9a7aaf5

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ package Maintainers;
485485
},
486486

487487
'ExtUtils::Manifest' => {
488-
'DISTRIBUTION' => 'BINGOS/ExtUtils-Manifest-1.65.tar.gz',
488+
'DISTRIBUTION' => 'BINGOS/ExtUtils-Manifest-1.66.tar.gz',
489489
'FILES' => q[cpan/ExtUtils-Manifest],
490490
'EXCLUDED' => [qr(^xt/)],
491491
},

cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use Carp;
1010
use strict;
1111
use warnings;
1212

13-
our $VERSION = '1.65';
13+
our $VERSION = '1.66';
1414
our @ISA = ('Exporter');
1515
our @EXPORT_OK = qw(mkmanifest
1616
manicheck filecheck fullcheck skipcheck
@@ -195,7 +195,7 @@ sub manifind {
195195
# $File::Find::name is unavailable.
196196
# Also, it's okay to use / here, because MANIFEST files use Unix-style
197197
# paths.
198-
find({wanted => $wanted},
198+
find({wanted => $wanted, follow => 1},
199199
$Is_MacOS ? ":" : ".");
200200

201201
return $found;
@@ -354,7 +354,7 @@ sub maniread {
354354

355355
# filename may contain spaces if enclosed in ''
356356
# (in which case, \\ and \' are escapes)
357-
if (($file, $comment) = /^'(\\[\\']|.+)+'\s*(.*)/) {
357+
if (($file, $comment) = /^'((?:\\[\\']|.+)+)'\s*(.*)/) {
358358
$file =~ s/\\([\\'])/$1/g;
359359
}
360360
else {

cpan/ExtUtils-Manifest/t/Manifest.t

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ BEGIN {
88
else {
99
unshift @INC, 't/lib';
1010
}
11+
$ENV{PERL_MM_MANIFEST_VERBOSE}=1;
1112
}
1213
chdir 't';
1314

1415
use strict;
1516

16-
use Test::More tests => 97;
17+
use Test::More tests => 98;
1718
use Cwd;
1819

1920
use File::Spec;
@@ -34,7 +35,6 @@ if ($Is_VMS) {
3435
$Is_VMS_noefs = 0 if $vms_efs;
3536
}
3637

37-
3838
# We're going to be chdir'ing and modules are sometimes loaded on the
3939
# fly in this test, so we need an absolute @INC.
4040
@INC = map { File::Spec->rel2abs($_) } @INC;
@@ -333,6 +333,20 @@ SKIP: {
333333
$funky_files{'space_quote_backslash'} = 'foo bar\\baz\'quux';
334334
}
335335

336+
# test including a filename which is itself a quoted string
337+
# https://rt.perl.org/Ticket/Display.html?id=122415
338+
SKIP: {
339+
my $quoted_filename = q{'quoted name.txt'};
340+
my $description = "quoted string";
341+
add_file( $quoted_filename => $description )
342+
or skip "couldn't create $description test file", 1;
343+
local $ExtUtils::Manifest::MANIFEST = "albatross";
344+
maniadd({ $quoted_filename => $description });
345+
is( maniread()->{$quoted_filename}, $description,
346+
'file whose name starts and ends with quotes' );
347+
$funky_files{$description} = $quoted_filename;
348+
}
349+
336350
my @funky_keys = qw(space space_quote space_backslash space_quote_backslash);
337351
# test including an external manifest.skip file in MANIFEST.SKIP
338352
{

0 commit comments

Comments
 (0)