From e3c4251a04d0985a86ee4c5c7189eddaacdb6dec Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 30 Jul 2013 14:13:55 +0200 Status: applied Debbug: 718337 Package: lintian Version: 2.5.16 Subject: [PATCH] c/deb-format.pm: Do not emit lzma-deb-archive on lzma compressed udebs Emit the correct tag udeb-uses-unsupported-compression-for-data-tarball instead. Signed-off-by: Guillem Jover --- checks/deb-format.pm | 5 ++--- t/tests/deb-format-udeb-compression/debian/debian/rules | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/deb-format.pm b/checks/deb-format.pm index 276b22e..dc95b03 100644 --- a/checks/deb-format.pm +++ b/checks/deb-format.pm @@ -53,6 +53,8 @@ if ($success) { } elsif ($members[1] ne 'control.tar.gz') { tag 'malformed-deb-archive', "second member $members[1] not control.tar.gz"; + } elsif ($type eq 'udeb' && $members[2] !~ m/^data\.tar\.[gx]z$/) { + tag 'udeb-uses-unsupported-compression-for-data-tarball'; } elsif ($members[2] eq 'data.tar.lzma') { # Ubuntu's archive allows lzma packages. tag 'lzma-deb-archive'; @@ -60,9 +62,6 @@ if ($success) { tag 'malformed-deb-archive', "third member $members[2] not data.tar.(gz|bz2|xz)"; } else { - if ($type eq 'udeb' && $members[2] !~ m/^data\.tar\.[gx]z$/) { - tag 'udeb-uses-unsupported-compression-for-data-tarball'; - } $okay = 1; } } else { diff --git a/t/tests/deb-format-udeb-compression/debian/debian/rules b/t/tests/deb-format-udeb-compression/debian/debian/rules index cba8c5d..5287abb 100644 --- a/t/tests/deb-format-udeb-compression/debian/debian/rules +++ b/t/tests/deb-format-udeb-compression/debian/debian/rules @@ -6,4 +6,4 @@ override_dh_builddeb: # manually call dpkg-deb because dh_builddeb uses -Zxz and does # not allow us to override it. - dpkg-deb -Zbzip2 --build debian/some-udeb ../some-udeb_1.0_all.udeb + dpkg-deb -Zlzma --build debian/some-udeb ../some-udeb_1.0_all.udeb -- 1.8.3.2