lintian: r331 - in trunk: checks debian
Author: jeroen
Date: 2004-07-07 22:30:47 +0200 (Wed, 07 Jul 2004)
New Revision: 331
Modified:
trunk/checks/binaries
trunk/checks/scripts
trunk/checks/shared-libs
trunk/debian/changelog
Log:
* checks/binaries:
+ [JvW] Parse the output of file a little bit more strict, and make it
consequent across checks (Closes: #257898)
Modified: trunk/checks/binaries
===================================================================
--- trunk/checks/binaries 2004-07-07 18:33:20 UTC (rev 330)
+++ trunk/checks/binaries 2004-07-07 20:30:47 UTC (rev 331)
@@ -118,7 +118,7 @@
my ($file,$info) = ($1,$2);
# binary or object file?
- next unless ($info =~ m/\bELF\b/) or ($info =~ m/\bcurrent ar archive\b/);
+ next unless ($info =~ m/^[^,]*\bELF\b/) or ($info =~ m/\bcurrent ar archive\b/);
if ($arch eq 'all') {
# package is `Architecture: all' but contains libs!?
@@ -126,7 +126,7 @@
}
# ELF?
- next unless $info =~ m/^ELF/o;
+ next unless $info =~ m/^[^,]*\bELF\b/o;
if ($file =~ m,^etc/,) {
tag "binary-in-etc", "$file";
Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts 2004-07-07 18:33:20 UTC (rev 330)
+++ trunk/checks/scripts 2004-07-07 20:30:47 UTC (rev 331)
@@ -163,9 +163,9 @@
# Fortunately no filenames containing ": " currently occur in Debian packages.
open(FILEINFO, "file-info") or fail("cannot open lintian file-info file: $!");
while (<FILEINFO>) {
- next unless (m/\bELF\b/);
- m/^(.*?): / or fail("bad line in file-info: $_");
- $ELF{$1} = 1;
+ m/^(.*?): (.*)/ or fail("bad line in file-info: $_");
+ my $file = $1;
+ $ELF{$file} = 1 if $2 =~ /^[^,]*\bELF\b/o;
}
close(FILEINFO);
Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs 2004-07-07 18:33:20 UTC (rev 330)
+++ trunk/checks/shared-libs 2004-07-07 20:30:47 UTC (rev 331)
@@ -88,7 +88,7 @@
# with file names containing colons and spaces, we're fucked.
m/^(?:\.\/)?(.+?):\s+(.*)$/o or fail("unrecognized file(1) output: $_");
my ($file,$info) = ($1,$2);
- if ($info =~ m/^ELF/ && $info =~ m/shared object/) {
+ if ($info =~ m/^[^,]*\bELF\b/ && $info =~ m/shared object/) {
$sharedobject{$file} = 1;
}
}
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-07 18:33:20 UTC (rev 330)
+++ trunk/debian/changelog 2004-07-07 20:30:47 UTC (rev 331)
@@ -17,6 +17,8 @@
latter can't be used as an indicator on that arch (Closes: #207063)
+ [JvW] Exempt ocaml binaries from the 'is the binary stripped?' test,
since they cannot be stripped harmlessly. See #256900 (Closes: #252695)
+ + [JvW] Parse the output of file a little bit more strict, and make it
+ consequent across checks (Closes: #257898)
* checks/changelog-files{,.desc}:
+ [HE] New check latest-debian-changelog-entry-without-new-date, comparing
the dates of the last 2 changelog entries. (Closes: #111215)
Reply to: