r55934 - /trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun Apr 11 10:08:55 2010
New Revision: 55934

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55934
Log:
extract_basic: unite the two finds looking for description/copyright

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

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=55934&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Sun Apr 11 10:08:55 2010
@@ -270,21 +270,17 @@
 
     find(
         sub {
-            $File::Find::name !~ $self->cfg->exclude
-                && /\.(pm|pod)$/
-                && $self->extract_desc($_);
+            return if $File::Find::name =~ $self->cfg->exclude;
+
+            if (/\.(pm|pod)$/) {
+                $self->extract_desc($_)
+                    unless $bin->short_description and $bin->long_description;
+                $self->extract_basic_copyright($_)
+                    unless $self->author and $self->copyright;
+            }
         },
         $self->main_dir
-    ) unless $bin->short_description and $bin->long_description;
-
-    find(
-        sub {
-            $File::Find::name !~ $self->cfg->exclude
-                && /\.(pm|pod)$/
-                && $self->extract_basic_copyright($_);
-        },
-        $self->main_dir
-    ) unless $self->author and $self->copyright;
+    );
 }
 
 sub extract_name_ver {