[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#727665: Patch



On 2013-10-30 23:34, Bastien ROUCARIES wrote:
> control: tags -1 + patch
> 
> 
> 0001-Fix-an-FTBFS-by-removing-escape-sequence.patch
> 

It works for sid, but not stable (and I guess that it won't work on
testing either).

> 
> From d7ba68a48c61199f6a86338a19aa5246f08c3cff Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
> Date: Wed, 30 Oct 2013 23:31:50 +0100
> Subject: [PATCH] Fix an FTBFS by removing escape sequence.
> 
> Fix an FTBFS by replacing \\ in tar file list by \.
> ---
>  lib/Lintian/Collect/Package.pm | 2 +-
>  t/tests/legacy-filenames/tags  | 1 +
>  2 files changed, 2 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/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
> -- 1.8.4.rc3

The new file doesn't appear to show up in stable.  d/rules for that test
have:

"""
        echo foo > debian/tmp/usr/share/doc/filenames/bokmål
        echo foo > debian/tmp/usr/share/doc/filenames/bokm\\ål
        echo foo > debian/tmp/usr/share/doc/filenames/bokm\\\\ål
        echo foo > debian/tmp/usr/share/doc/filenames/bokm<E5>l
        echo foo > debian/tmp/usr/share/doc/filenames/bokm\\<E5>l
        echo foo > debian/tmp/usr/share/doc/filenames/bokm\\\\<E5>l
"""

So I suspect it is an old bug that is now being fixed with this.  The
question is whether we can fix this in testing/stable as well or just go
for "tar (>= 1.27-1)" and then ignore the problem in stable[1] (it is
not like filenames containing two backslashes are all that common).

~Niels

[1] That is, only run the test when tar 1.27-1 is present plus require
tar 1.27-1 for Jessie (but not require it for Wheezy, e.g. via a bash
(<<  4.2+dfsg-1~) like we do now in B-D for pkg-php-tools).


Reply to: