[dh-make-perl-cvs-dev] CVS dh-make-perl

CVS User gwolf cvs@dh-make-perl.alioth.debian.org
Sat, 14 May 2005 22:36:56 +0000


Update of /cvsroot/dh-make-perl/dh-make-perl
In directory haydn:/tmp/cvs-serv27363

Modified Files:
	dh-make-perl 
Log Message:
Fixed extract_name_ver to correctly deal with empty META.yml files


--- /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2005/04/11 21:35:52	1.34
+++ /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2005/05/14 22:36:55	1.35
@@ -352,11 +352,11 @@
 sub extract_name_ver {
 	my $meta = "$maindir/META.yml";
 	my $makefile = "$maindir/Makefile.PL";
+	my $name_ver;
 	if(-f $meta) {
-                return extract_name_ver_from_meta($meta);
-	} else {
-		return extract_name_ver_from_makefile($makefile);
-	}
+                $name_ver = extract_name_ver_from_meta($meta);
+	} 
+	return $name_ver || extract_name_ver_from_makefile($makefile);
 }
 
 sub extract_name_ver_from_meta {