[SCM] Debian package checker branch, master, updated. 2.2.9-3-g72c041b
The following commit has been merged in the master branch:
commit 72c041ba50d00b9a5a6543e804df43d42e93b410
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Apr 10 16:46:44 2009 +0100
Avoid errors when filenames in the package start with "-"
* collection/file-info:
+ [ADB] Call "file" with "--" to ensure that any filenames in the package
that start with "-" aren't interpreted as options to "file". Thanks,
Trent W. Buck. (Closes: #523408)
diff --git a/collection/file-info b/collection/file-info
index 26ce743..b40d9a9 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -43,7 +43,7 @@ chdir("unpacked")
my %opts = ( pipe_in => FileHandle->new,
out => '../file-info',
fail => 'never' );
-spawn(\%opts, ['xargs', '-0r', 'file']);
+spawn(\%opts, ['xargs', '-0r', 'file', '--']);
$opts{pipe_in}->blocking(1);
open(INDEX, '<', "../index")
or fail("cannot open index file: $!");
diff --git a/debian/changelog b/debian/changelog
index f73b5dc..967ba8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ lintian (2.2.10) UNRELEASED; urgency=low
+ [ADB] Fix a couple of spelling mistakes ("verison" -> "version").
Thanks, Guillaume Delacour. (Closes: #522643)
+ * collection/file-info:
+ + [ADB] Call "file" with "--" to ensure that any filenames in the package
+ that start with "-" aren't interpreted as options to "file". Thanks,
+ Trent W. Buck. (Closes: #523408)
+
* lib/Lintian/Relation.pm:
+ [ADB] Fix a spelling mistake ("verison" -> "version"). Thanks,
Guillaume Delacour.
diff --git a/t/tests/files-general/debian/--lzma b/t/tests/files-general/debian/--lzma
new file mode 100644
index 0000000..5241aaa
--- /dev/null
+++ b/t/tests/files-general/debian/--lzma
@@ -0,0 +1,2 @@
+Test file to check that various parts of Lintian correctly handle files with names that look
+like options
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index f484604..a250062 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -1,2 +1,3 @@
lintian-16x16.png usr/share/apps/lintian/icons/hicolor/22x22
lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
+--lzma usr/share/doc/lintian
--
Debian package checker
Reply to: