>>>>> On Wed, 17 Apr 2002 16:44:34 -0400, Michael G Schwern <[EMAIL PROTECTED]> said:
> This shouldn't do much but throw several "odd number of elements in
> hash" warnings. _maniskip() takes a hash, not file + hash.
Yupp, sorry, that was an odd fix. What about this one?
manifind always was doing just a find, no analysing.
It fixes the problem with parrot, but I haven't tested it more than that.
--- /usr/sources/perl/repoperls/perl-5.7.3@15988/lib/ExtUtils/Manifest.pm Thu
Apr 18 06:41:06 2002
+++ /usr/local/perl-5.7.3@15975/lib/5.7.3/ExtUtils/Manifest.pm Thu Apr 18 07:28:26
+2002
@@ -79,14 +79,13 @@
sub manifind {
my $p = shift || {};
- my $skip = _maniskip(warn => $p->{warn_on_skip});
my $found = {};
my $wanted = sub {
my $name = clean_up_filename($File::Find::name);
warn "Debug: diskfile $name\n" if $Debug;
- return if $skip->($name) or -d $name;
-
+ return if -d $name;
+
if( $Is_VMS ) {
$name =~ s#(.*)\.$#\L$1#;
$name = uc($name) if $name =~ /^MANIFEST(\.SKIP)?$/i;
@@ -99,8 +98,6 @@
# Also, it's okay to use / here, because MANIFEST files use Unix-style
# paths.
find({wanted => $wanted,
- preprocess =>
- sub {grep {!$skip->( clean_up_filename("$File::Find::dir/$_") )} @_},
no_chdir => 1,
},
$Is_MacOS ? ":" : ".");
@@ -209,7 +206,7 @@
my (%args) = @_;
my @skip ;
- my $mfile ||= "$MANIFEST.SKIP";
+ my $mfile = "$MANIFEST.SKIP";
local *M;
open M, $mfile or open M, $DEFAULT_MSKIP or return sub {0};
while (<M>){
@@ -225,10 +222,7 @@
# any of them contain alternations
my $regex = join '|', map "(?:$_)", @skip;
- return ($args{warn}
- ? sub { $_[0] =~ qr{$opts$regex} && warn "Skipping $_[0]\n" }
- : sub { $_[0] =~ qr{$opts$regex} }
- );
+ return sub { $_[0] =~ qr{$opts$regex} };
}
sub manicopy {
--
andreas
