[SCM] Debian package checker branch, master, updated. 2.5.4-41-g92a5b55
The following commit has been merged in the master branch:
commit 92a5b55947ccdf72dd844052e75f58ef9f0936f9
Author: Niels Thykier <niels@thykier.net>
Date: Thu Dec 8 16:52:08 2011 +0100
file-info-helper: Skip non-files with .gz extension
If file(1) says that a non-file is not a .gz file, then it is
certainly right.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/collection/file-info-helper b/collection/file-info-helper
index b37b850..fdc005c 100755
--- a/collection/file-info-helper
+++ b/collection/file-info-helper
@@ -5,7 +5,7 @@ use warnings;
while ( my $line = <> ) {
my ($file, $type) = $line =~ (m/^(.*?)\x00(.*)$/o);
- if ($file =~ m/\.gz$/o && -e $file && ! -l $file && $type !~ m/compressed/o){
+ if ($file =~ m/\.gz$/o && -f $file && ! -l $file && $type !~ m/compressed/o){
# While file could be right, it is unfortunately
# regularly wrong here as well; double check the type
my $text = '';
diff --git a/debian/changelog b/debian/changelog
index 8fc8fb2..0256c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
* collection/index:
+ [NT] Use Lintian::Processable::Package to determine source
name and version.
+ * collection/file-info-helper:
+ + [NT] Do not open non-files when double-checking gzip files.
* collection/source-control-file{,.desc}:
+ [NT] Removed as they are no longer needed. They have been
replaced by a smarter Lintian::Collect.
--
Debian package checker
Reply to: