This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 79dccbe91e950f343007f572307f4b8659d588f0 Author: James McCoy <[email protected]> Date: Fri Jul 31 20:26:41 2015 -0400 licensecheck: Fix an endless loop parsing certain files Closes: #794263 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 2 ++ scripts/licensecheck.pl | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cbbc1a..8d5ef22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ devscripts (2.15.7) UNRELEASED; urgency=medium ability to check files with mime types like text/x-c++ and application/postscript. Thanks to Jonas Smedegaard for the patch. (Closes: #794282) + + Fix an endless loop in parsing certain files. Thanks to Jonas + Smedegaard for the patch. (Closes: #794263) -- James McCoy <[email protected]> Fri, 31 Jul 2015 19:53:04 -0400 diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index 047dc7f..358dc35 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -380,8 +380,8 @@ sub extract_copyright { while (@c) { my $line = shift @c ; my $copyright_match = parse_copyright($line) ; - if ($copyright_match) { - while ($copyright_match =~ /\d[,.]?\s*$/) { + if ($copyright_match) { + while (@c && $copyright_match =~ /\d[,.]?\s*$/) { # looks like copyright end with a year, assume the owner is on next line(s) $copyright_match .= ' '. shift @c; } -- 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
