r26999 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Nov 18 07:52:02 2008
New Revision: 26999

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26999
Log:
Avoid usage of uninitialized variable when no META file was found

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=26999&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Nov 18 07:52:02 2008
@@ -10,6 +10,7 @@
     Closes: #487850 -- allow adding, not overwriting dependencies with
                        --depends and friends
   * Do not bail out when unable to determine dependencies
+  * Avoid usage of uninitialized variable when no META file was found
 
   [ Gunnar Wolf ]
   * Now creates machine-parsable debian/copyright files (cf.

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=26999&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Tue Nov 18 07:52:02 2008
@@ -1132,7 +1132,7 @@
 "    and fix this file!"
 	);
 
-    if ($meta->{license} or $copyright) {
+    if ($meta and $meta->{license} or $copyright) {
 	my $mangle_cprt;
 	# Pre-mangle the copyright information for the common similar cases
 	$mangle_cprt = $copyright || ''; # avoid warning
@@ -1143,8 +1143,8 @@
 	# mind that many licenses are not meant to be used as
 	# templates (i.e. you must add the author name and some
 	# information within the licensing text as such).
-	if ($meta && $meta->{license} =~ /perl/i or
-	    $mangle_cprt && $mangle_cprt =~ /terms\s*as\s*Perl\s*itself/is) {
+	if ($meta and $meta->{license} and $meta->{license} =~ /perl/i or
+	    $mangle_cprt =~ /terms\s*as\s*Perl\s*itself/is) {
 	    push @res, "License-Alias: Perl";
 	    $licenses{'GPL-1+'} = 1;
 	    $licenses{'Artistic'} = 1;