[devscripts] 08/09: Fix unitialized value warning when copyright is not in copyright-format 1.0

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 1c8895c55c372ed3b8cb5ce89f1db60f155cc5b9
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Dec 21 23:25:38 2013 +0100

    Fix unitialized value warning when copyright is not in copyright-format 1.0
    
    If debian/copyright is not in copyright-format 1.0 but say in old
    revision of dep5, uscan issues a uninitialized value in pattern match
    (m//) at /usr/bin/uscan line 1505.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 4 ++++
 scripts/uscan.pl | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f7ec4cb..bd1b8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ devscripts (2.13.9) UNRELEASED; urgency=low
         accessible to other users.
     + Fix handling of 'dirname' exclusions, so 'dirname/*' isn't required.
 
+  [ Salvatore Bonaccorso ]
+  * uscan: Fix unitialized value warning when copyright is not in
+    copyright-format 1.0.  (Closes: #732807)
+
  -- Martin Pitt <mpitt at debian.org>  Thu, 12 Dec 2013 11:08:27 +0100
 
 devscripts (2.13.8) unstable; urgency=medium
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 7da9c11..433f5e2 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1514,7 +1514,11 @@ EOF
 	} or do {
 	  undef $data;
 	};
-	if ($data && $data->{'format'} =~ m{^$okformat/?$} && $data->{'files-excluded'} ) {
+	if (   $data
+	    && defined $data->{'format'}
+	    && $data->{'format'} =~ m{^$okformat/?$}
+	    && $data->{'files-excluded'})
+	{
 	    my $tempdir = tempdir ("uscanXXXX", TMPDIR => 1, CLEANUP => 1);
 	    # Parent of the target directory should be under our control
 	    $tempdir .= '/repack';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git