[devscripts] 02/02: mk-origtargz: Better error handling for missing copyright files

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository devscripts.

commit 00fe30589a6e9286ab8ef9f6f17b4ada35804916
Author: Joachim Breitner <nomeata at debian.org>
Date:   Wed Apr 23 18:44:38 2014 +0200

    mk-origtargz: Better error handling for missing copyright files
---
 scripts/mk-origtargz.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index 5e5fd78..bd7c9b7 100755
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -260,7 +260,8 @@ unless (defined $package) {
 		$version =~ s/^\d+://; # strip epoch
 	}
 
-	unshift @copyright_files, "debian/copyright";
+	unshift @copyright_files, "debian/copyright"
+		if -r "debian/copyright";
 
 	# set destination directory
 	unless (defined $destdir) {
@@ -282,7 +283,9 @@ for my $copyright_file (@copyright_files) {
         } or do {
 		undef $data;
         };
-        if (   $data
+	if (not -e $copyright_file) {
+		uscan_die ("File $copyright_file not found.");
+	} elsif (   $data
             && defined $data->{'format'}
             && $data->{'format'} =~ m{^$okformat/?$})
         {
@@ -291,7 +294,7 @@ for my $copyright_file (@copyright_files) {
 			# un-escape
 			push @exclude_globs, map { s/\\(.)/$1/g; s?/+$??; $_ } @rawexcluded;
 		}
-	} elsif (-r $copyright_file) {
+	} else {
 		# be helpful
 		my $has_files_excluded = 0;
 		open COPYRIGHT, "debian/copyright" or die "debian/copyright $!\n";

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