This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 87cad45dca8e42413ab2b185c3436b490614ba40 Author: James McCoy <[email protected]> Date: Fri Dec 6 19:09:13 2013 -0500 uscan: Properly handle a non-machine readable d/copyright file Closes: #731537 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 2 ++ scripts/uscan.pl | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7540faa..fe1b74e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ devscripts (2.13.6) UNRELEASED; urgency=medium * chdist: Fix a [A-z] regex typo. + * uscan: Properly handle a non-machine readable d/copyright file. (Closes: + #731537) -- James McCoy <[email protected]> Thu, 05 Dec 2013 22:47:37 -0500 diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 22ab185..8f4d36c 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1494,9 +1494,14 @@ EOF my $excludesuffix = '+dfsg'; if ($exclusion) { my $data = Dpkg::Control::Hash->new(); - $data->load('debian/copyright'); my $okformat = qr'http://www.debian.org/doc/packaging-manuals/copyright-format/[.\d]+'; - if ($data->{'format'} =~ m{^$okformat/?$} and $data->{'files-excluded'} ) { + eval { + $data->load('debian/copyright'); + 1; + } or do { + undef $data; + }; + if ($data && $data->{'format'} =~ m{^$okformat/?$} && $data->{'files-excluded'} ) { my $tempdir = tempdir ( "uscanXXXX", TMPDIR => 1, CLEANUP => 1 ); my $globpattern = "*"; my $hidden = ".[!.]*"; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
