[dh-make-perl] 02/02: FromCPAN/find_debs_for_modules: do not crash when all offerred packages are perl(-(modules|base))?

[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 ee0ff70fd1f689bb2ded7beb95a2dc5efb54d165
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat Oct 19 21:33:50 2013 +0000

    FromCPAN/find_debs_for_modules: do not crash when all offerred packages are perl(-(modules|base))?
    
    Closes: #725206
---
 lib/Debian/Control/FromCPAN.pm |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Debian/Control/FromCPAN.pm b/lib/Debian/Control/FromCPAN.pm
index 787575f..1749cc1 100644
--- a/lib/Debian/Control/FromCPAN.pm
+++ b/lib/Debian/Control/FromCPAN.pm
@@ -338,9 +338,10 @@ sub find_debs_for_modules {
                           ( @pkgs > 1 )
                         ? [ map { { pkg => $_, ver => $version } } @pkgs ]
                         : ( $pkgs[0], $version )
-                    );
+                    ) if @pkgs;
                 }
-                elsif ($apt_contents) {
+
+                if ( not $alt_dep and $apt_contents) {
                     $alt_dep
                         = $apt_contents->find_perl_module_package( $module,
                         $version );
@@ -352,6 +353,7 @@ sub find_debs_for_modules {
                     '>=', $version );
 
                 $dep = Debian::Dependency->new("$alt_dep | $dep");
+                #print "    $dep\n";
             }
         }
         else {

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