[devscripts] 01/02: licensecheck: parse file matching -c regex... (Closes: #803724)

[dod at debian.org]

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

dod pushed a commit to branch master
in repository devscripts.

commit 679e8778dde24a7c4b78d07cc5e2268890b877c0
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Nov 11 20:42:45 2015 +0100

    licensecheck: parse file matching -c regex... (Closes: #803724)
    
    .. no matter its mime type. This restore licensecheck behavior with
    ---check option.
---
 debian/changelog        | 5 +++++
 scripts/licensecheck.pl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fe5839e..5204312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 devscripts (2.15.10) UNRELEASED; urgency=medium
 
+  [ Benjamin Drung ]
   * test_uscan: Fix failure in testFileExclusion due to wrong tarfile name
     test on Ubuntu.
 
+  [ Dominique Dumont ]
+  * licensecheck: parse file matching -c regex whatever its mime
+    type (Closes: #803724)
+
  -- Benjamin Drung <bdrung at debian.org>  Fri, 23 Oct 2015 23:54:58 +0200
 
 devscripts (2.15.9) unstable; urgency=medium
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 3d1ff2e..798535f 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -350,7 +350,7 @@ while (@files) {
 	chomp $mime;
 	warn "$0 warning: cannot parse file '$file' with mime type '$mime'\n";
 	$charset = 'maybe-binary';
-	next if $OPT{text};
+	next unless $check_regex; # user asked for this file
     }
 
     open (my $F, '<' ,$file) or die "Unable to access $file\n";

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