[lintian] 01/01: Fix an FTBFS by removing escape sequence.
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 80f4060ec58262f2cd261fe9677f8de71fb411dd
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Wed Oct 30 23:31:50 2013 +0100
Fix an FTBFS by removing escape sequence.
Fix an FTBFS by replacing \\ in tar file list by \.
Workarround this bug by not running the test on buggy tar version.
---
lib/Lintian/Collect/Package.pm | 2 +-
t/tests/legacy-filenames/desc | 2 ++
t/tests/legacy-filenames/tags | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/Lintian/Collect/Package.pm b/lib/Lintian/Collect/Package.pm
index 4f5a2cb..e7c1fb8 100644
--- a/lib/Lintian/Collect/Package.pm
+++ b/lib/Lintian/Collect/Package.pm
@@ -324,7 +324,7 @@ sub _dequote_name {
$slsd = 1 unless defined $slsd; # Remove initial ./ by default
$name =~ s,^\.?/,, if $slsd;
$name =~ s/(\G|[^\\](?:\\\\)*)\\(\d{3})/"$1" . chr(oct $2)/ge;
- $name =~ s/\\\\/\\/;
+ $name =~ s/\\\\/\\/g;
return $name;
}
diff --git a/t/tests/legacy-filenames/desc b/t/tests/legacy-filenames/desc
index 6fbe186..7b084ca 100644
--- a/t/tests/legacy-filenames/desc
+++ b/t/tests/legacy-filenames/desc
@@ -2,4 +2,6 @@ Testname: legacy-filenames
Source: filenames
Sequence: 9999
Version: 1:12-0.1
+# tar -t is buggy and does not list \\\ filename
+Test-Depends: tar (>= 1.27)
Description: Legacy test "filenames"
diff --git a/t/tests/legacy-filenames/tags b/t/tests/legacy-filenames/tags
index 11f72cf..96a5e36 100644
--- a/t/tests/legacy-filenames/tags
+++ b/t/tests/legacy-filenames/tags
@@ -100,6 +100,7 @@ W: filenames: file-in-usr-lib-sgml usr/lib/sgml/package
W: filenames: file-name-ends-in-whitespace files/'\
W: filenames: file-name-is-not-valid-UTF-8 usr/share/doc/filenames/bokm?l
W: filenames: file-name-is-not-valid-UTF-8 usr/share/doc/filenames/bokm\?l
+W: filenames: file-name-is-not-valid-UTF-8 usr/share/doc/filenames/bokm\\?l
W: filenames: gz-file-not-gzip usr/share/filenames/prototype.js.gz
W: filenames: macos-ds-store-file-in-package usr/share/doc/filenames/.DS_Store
W: filenames: macos-resource-fork-file-in-package usr/share/doc/filenames/._NEWS.Debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: