This is an automated email from the git hooks/post-receive script. broucaries-guest pushed a commit to branch master in repository lintian.
commit e7f320441cb9f0e292c9e6d071069110469b0f68 Author: Bastien ROUCARIÈS <[email protected]> Date: Sat Jan 2 22:52:48 2016 +0100 Check also arch:all config script Arch all config script should not refer to arch only path Signed-off-by: Bastien ROUCARIÈS <[email protected]> --- checks/files.desc | 2 +- checks/files.pm | 2 +- .../debian/debian/config-all.install | 1 + .../files-old-config-script/debian/debian/control.in | 19 +++++++++++++++---- .../debian/generated/arch-all-config.in | 2 ++ .../debian/generated/arch-cross-all-config.in | 3 +++ 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/checks/files.desc b/checks/files.desc index 2347f5e..48b6917 100644 --- a/checks/files.desc +++ b/checks/files.desc @@ -696,7 +696,7 @@ Info: The following file is a old style config file, used It is typically used to compile and link against one or more libraries. . This old style config file contains a multi-arch path and the package - is not Multi-arch: no. + is not Multi-arch: no or package is arch: all. Tag: package-contains-upstream-install-documentation Severity: normal diff --git a/checks/files.pm b/checks/files.pm index 97e5191..aad3474 100644 --- a/checks/files.pm +++ b/checks/files.pm @@ -845,7 +845,7 @@ sub run { tag 'old-style-config-script',$file; my $multiarch = $info->field('multi-arch',''); # could be ok but only if multi-arch: no - unless($multiarch eq 'no') { + if($multiarch ne 'no' or $arch eq 'all') { # check multi-arch path foreach my $arch ($MULTIARCH_DIRS->all) { my $madir diff --git a/t/tests/files-old-config-script/debian/debian/config-all.install b/t/tests/files-old-config-script/debian/debian/config-all.install new file mode 100644 index 0000000..53238e4 --- /dev/null +++ b/t/tests/files-old-config-script/debian/debian/config-all.install @@ -0,0 +1 @@ +usr/bin/*-all-config diff --git a/t/tests/files-old-config-script/debian/debian/control.in b/t/tests/files-old-config-script/debian/debian/control.in index 4da8a79..2c3a422 100644 --- a/t/tests/files-old-config-script/debian/debian/control.in +++ b/t/tests/files-old-config-script/debian/debian/control.in @@ -6,23 +6,34 @@ Standards-Version: {$standards_version} Build-Depends: debhelper (>= 9) Package: config-ma-no -Architecture: all +Architecture: any Depends: $\{misc:Depends\}, $\{shlib:Depends\} Multi-arch: no Description: Contains config test file no This is a test package designed to exercise some feature or tag of - Lintian for arch all pkgconfig files. + Lintian for arch any ma no config script. It is part of the Lintian test suite and may do very odd things. It should not be installed like a regular package. It may be an empty package. Package: config-ma-foreign -Architecture: all +Architecture: any Multi-arch: foreign Depends: $\{misc:Depends\}, $\{shlib:Depends\} Description: Contains config test file foreign This is a test package designed to exercise some feature or tag of - Lintian for arch any pkgconfig files. + Lintian for arch any config script ma foreign. + It is part of the Lintian test suite and may do very odd + things. It should not be installed like a regular package. It may + be an empty package. + +Package: config-all +Architecture: all +Depends: $\{misc:Depends\}, $\{shlib:Depends\} +Multi-arch: no +Description: Contains config test file all arch + This is a test package designed to exercise some feature or tag of + Lintian for arch all ma no config script. It is part of the Lintian test suite and may do very odd things. It should not be installed like a regular package. It may be an empty package. diff --git a/t/tests/files-old-config-script/debian/generated/arch-all-config.in b/t/tests/files-old-config-script/debian/generated/arch-all-config.in new file mode 100644 index 0000000..9d7a85c --- /dev/null +++ b/t/tests/files-old-config-script/debian/generated/arch-all-config.in @@ -0,0 +1,2 @@ +#!/bin/bash +echo "-I/usr/include/$(ARCH)/arch-include-arch" diff --git a/t/tests/files-old-config-script/debian/generated/arch-cross-all-config.in b/t/tests/files-old-config-script/debian/generated/arch-cross-all-config.in new file mode 100644 index 0000000..665922b --- /dev/null +++ b/t/tests/files-old-config-script/debian/generated/arch-cross-all-config.in @@ -0,0 +1,3 @@ +#!/bin/sh +echo "-I/usr/include/$(ARCH_CROSS)/someconfig.h" + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
