[dh-make-perl] 01/01: Config: fixup module name after possible setting it when run as 'cpan2deb'

[Damyan Ivanov]

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

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

commit 1eac9b776374f9eef559b3fd1ead28a1bee8e79c
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Feb 11 21:34:01 2015 +0000

    Config: fixup module name after possible setting it when run as 'cpan2deb'
    
    Thing is, CPAN is more tolerant where you search for a module named
    'Foo::Bar' than when you search for 'Foo-Bar'
    
    Closes: #777718 -- cpan2deb using wrong module from CPAN
---
 lib/DhMakePerl/Config.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/DhMakePerl/Config.pm b/lib/DhMakePerl/Config.pm
index 7ddc961..01c4ab1 100644
--- a/lib/DhMakePerl/Config.pm
+++ b/lib/DhMakePerl/Config.pm
@@ -145,10 +145,6 @@ sub parse_command_line_options {
     GetOptions( \%opts, @OPTIONS )
         or die "Error parsing command-line options\n";
 
-    # Make CPAN happy, make the user happy: Be more tolerant!
-    # Accept names to be specified with double-colon, dash or slash
-    $opts{cpan} =~ s![/-]!::!g if $opts{cpan};
-
     # "If no argument is given (but the switch is specified - not specifying
     # the switch will include everything), it defaults to dpkg-source's
     # default values."
@@ -227,6 +223,13 @@ sub parse_command_line_options {
         $self->command('make');
     }
 
+    # Make CPAN happy, make the user happy: Be more tolerant!
+    # Accept names to be specified with double-colon, dash or slash
+    if ( my $name = $self->cpan ) {
+        $name =~ s![/-]!::!g;
+        $self->cpan($name);
+    }
+
     $self->check_obsolete_entries;
 }
 

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