r53192 - /trunk/dh-make-perl/lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Feb 22 10:55:32 2010
New Revision: 53192

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53192
Log:
extract_docs: fix skipping VCS directories

Modified:
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53192&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Mon Feb 22 10:55:32 2010
@@ -992,26 +992,29 @@
 
     $dir .= '/' unless $dir =~ m(/$);
     find(
-        sub {
-            if (   $File::Find::dir eq '.svn-base'
-                or $File::Find::dir eq '.svn'
-                or $File::Find::dir eq '.git' )
-            {
-                $File::Find::prune = 1;
-                return;
-            }
-            push(
-                @{ $self->docs },
-                substr( $File::Find::name, length($dir) )
-                )
-                if (
-                    /^\b(README|TODO|BUGS|NEWS|ANNOUNCE)\b/i
-                and !/\.(pod|pm)$/
-                and ( !$self->cfg->exclude
-                    or $File::Find::name !~ $self->cfg->exclude )
-                and !/\.svn-base$/
-                and $File::Find::name !~ m{debian/README\.source}
-                );
+        {   preprocess => sub {
+                my $bn = basename $File::Find::dir;
+                return ()
+                    if $bn eq '.svn-base'
+                        or $bn eq '.svn'
+                        or $bn eq '.git';
+
+                return @_;
+            },
+            wanted => sub {
+                push(
+                    @{ $self->docs },
+                    substr( $File::Find::name, length($dir) )
+                    )
+                    if (
+                        /^\b(README|TODO|BUGS|NEWS|ANNOUNCE)\b/i
+                    and !/\.(pod|pm)$/
+                    and ( !$self->cfg->exclude
+                        or $File::Find::name !~ $self->cfg->exclude )
+                    and !/\.svn-base$/
+                    and $File::Find::name !~ m{debian/README\.source}
+                    );
+            },
         },
         $dir
     );