[dh-make-perl-cvs-dev] CVS dh-make-perl
CVS User gwolf
cvs@dh-make-perl.alioth.debian.org
Wed, 18 May 2005 14:42:31 +0000
Update of /cvsroot/dh-make-perl/dh-make-perl
In directory haydn:/tmp/cvs-serv20469
Modified Files:
dh-make-perl
Log Message:
Closing bugs 303806 and 309552
--- /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl 2005/05/14 22:36:55 1.35
+++ /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl 2005/05/18 14:42:30 1.36
@@ -352,11 +352,12 @@
sub extract_name_ver {
my $meta = "$maindir/META.yml";
my $makefile = "$maindir/Makefile.PL";
- my $name_ver;
+ my ($name, $ver);
if(-f $meta) {
- $name_ver = extract_name_ver_from_meta($meta);
+ ($name, $ver) = extract_name_ver_from_meta($meta);
}
- return $name_ver || extract_name_ver_from_makefile($makefile);
+ return ($name && $ver) ? ($name, $ver) :
+ extract_name_ver_from_makefile($makefile);
}
sub extract_name_ver_from_meta {
@@ -473,6 +474,7 @@
sub extract_depends {
my ($dir) = shift;
$dir .= '/' unless $dir =~ m/\/$/;
+ local @INC = ($dir, @INC);
my $mod_dep = Module::Depends::Intrusive->new();
@@ -482,7 +484,7 @@
my %dep_hash = %{$mod_dep->requires};
my $error = $mod_dep->error();
- die "Error $error\n" if $error;
+ die "Error: $error\n" if $error;
my @uses;