[SCM] Debian package checker branch, master, updated. 2.5.10-102-g75e5517
The following commit has been merged in the master branch:
commit 75e5517d6f3ca418477fae2c26c9cb879a0f0dbd
Author: Niels Thykier <niels@thykier.net>
Date: Fri Aug 3 16:51:58 2012 +0200
c/cruft: Fix false-positive "prebuilt-windows-binary" tag
The MS-DOS part of the regex unintentionally matched any file(1)
output with "MS-DOS" in it. This caused gzip files produced on Win32
platforms to be considered an "Windows executable".
Regression introduced in e0ff721.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index ab7fd14..abd69b2 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -150,7 +150,7 @@ for my $file ($info->sorted_index) {
my $file_info = $info->file_info ($file);
if ($file_info =~ m/\bELF\b/) {
tag 'source-contains-prebuilt-binary', $file;
- } elsif ($file_info =~ m/\b(?:MS-DOS|PE(?:32|64)|COFF executable)\b/) {
+ } elsif ($file_info =~ m/\b(?:PE(?:32|64)|(?:MS-DOS|COFF) executable)\b/) {
tag 'source-contains-prebuilt-windows-binary', $file;
} elsif ($file =~ /\bwaf$/) {
my $ok = 1;
--
Debian package checker
Reply to: