[dh-make-perl] 01/07: rename $desc to $short_desc

gregor herrmann gregoa at debian.org
Fri Aug 26 23:35:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository dh-make-perl.

commit 496de9c3ee61ec7b89e5bb01b933a28e62f55e98
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Aug 26 23:46:41 2016 +0200

    rename $desc to $short_desc
    
    clearer, and matches $long_desc
    and $bin->short_description()
    
    Gbp-Dch: Ignore
---
 lib/DhMakePerl/Command/Packaging.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 49a1404..59a38f2 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -661,16 +661,16 @@ sub extract_desc {
     my ( $self, $file ) = @_;
 
     my $bin = $self->control->binary_tie->Values(0);
-    my $desc = $bin->short_description;
+    my $short_desc = $bin->short_description;
 
-    $desc and return;
+    $short_desc and return;
 
     return unless -f $file;
     my ( $parser, $modulename );
     $parser = new DhMakePerl::PodParser;
     $parser->set_names(qw(NAME DESCRIPTION DETAILS));
     $parser->parse_from_file($file);
-    if ( $desc ) {
+    if ( $short_desc ) {
 
         # No-op - We already have it, probably from the command line
 
@@ -678,7 +678,7 @@ sub extract_desc {
     elsif ( $self->meta->{abstract} ) {
 
         # Get it from META.yml
-        $desc = $self->meta->{abstract};
+        $short_desc = $self->meta->{abstract};
 
     }
     elsif ( my $my_desc = $parser->get('NAME') ) {
@@ -689,20 +689,20 @@ sub extract_desc {
         $my_desc =~ s/\s+$//s;
         $my_desc =~ s/^([^\s])/ $1/mg;
         $my_desc =~ s/\n.*$//s;
-        $desc = $my_desc;
+        $short_desc = $my_desc;
     }
 
-    if ( defined($desc) ) {
+    if ( defined($short_desc) ) {
         # Replace linefeed (not followed by a space) in short description with
         # spaces
-        $desc =~ s/\n(?=\S)/ /gs;
-        $desc =~ s/^\s+//;      # strip leading spaces
+        $short_desc =~ s/\n(?=\S)/ /gs;
+        $short_desc =~ s/^\s+//;      # strip leading spaces
     }
 
     # have a fall-back for the short description
-    $desc ||= '(no short description found)';
+    $short_desc ||= '(no short description found)';
 
-    $bin->short_description($desc);
+    $bin->short_description($short_desc);
 
     my $long_desc;
     unless ( $bin->long_description ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git



More information about the Pkg-perl-cvs-commits mailing list