Felix Lechner pushed to branch master at lintian / lintian


Commits:
3db40eda by Felix Lechner at 2022-03-07T14:39:59-08:00
Drop debhelper-compatibility-level-not-a-number; untestable due to changes in 
Debhelper.

This is probably the change in Debhelper that made the tag untestable:

    
https://salsa.debian.org/debian/debhelper/-/commit/da49713e5d683db6514ef64f4ad250ace7511452

The error probably went undetected for a while because Lintian's autopkgtest
pipeline has been out of order for a while. (For details, see Bug#998367.)
Avoids that error in the unstable pipeline on Salsa CI:

Failed build tasks:

>>> 
t/recipes/../../autopkgtest_tmp/build-and-evaluate-test-packages/packages/checks/debhelper/compat-level-not-a-number:
make --trace -f 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/Makefile
 DEFAULT_DH_COMPAT=13 failed at private/runtests line 787.
Building in 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/packages/checks/debhelper/compat-level-not-a-number
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/Makefile:63:
 target 'compat-level-not-a-number_1.0.orig.tar.gz' does not exist
mkdir compat-level-not-a-number-1.0
if [ -d 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/orig/.
 ] ; then \
cp -rp 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/orig/.
 compat-level-not-a-number-1.0 ; \
fi
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/Makefile:35:
 update target 'compat-level-not-a-number_1.0_amd64.changes' due to: 
compat-level-not-a-number_1.0.orig.tar.gz
if [ -r compat-level-not-a-number_1.0.orig.tar.gz -a -r 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/upstream/private-key.asc
 ] ; then \
tmpdir=/tmp/tmp.ik7mzVU0pg ; \
gpg --homedir "$tmpdir" --import 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/upstream/private-key.asc
 ; \
gpg --homedir "$tmpdir" --batch --yes --armor --output 
compat-level-not-a-number_1.0.orig.tar.gz.asc \
--detach-sign compat-level-not-a-number_1.0.orig.tar.gz ; \
gpg-connect-agent --homedir "$tmpdir" KILLAGENT /bye ; \
rm -rf "$tmpdir" ; \
fi
if [ -d 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/diff/.
 ] ; then \
cp -rp 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/diff/.
 compat-level-not-a-number-1.0 ; \
fi
if [ -d 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/debian/.
 ] ; then \
cp -rp 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/debian/.
 compat-level-not-a-number-1.0/debian ; \
fi
if [ -x 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/pre-build
 ] ; then \
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/pre-build
 
/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/packages/checks/debhelper/compat-level-not-a-number/compat-level-not-a-number-1.0
 ; \
fi
cd compat-level-not-a-number-1.0 && dpkg-buildpackage -rfakeroot  -us 
-uc -d \
-iNEVER_MATCH_ANYTHING -INEVER_MATCH_ANYTHING --source-option=--auto-commit
dpkg-buildpackage: info: source package compat-level-not-a-number
dpkg-buildpackage: info: source version 1.0
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Debian Lintian Maintainers 
<[email protected]>
dpkg-buildpackage: warning: debian/rules is not executable; fixing that
 dpkg-source -iNEVER_MATCH_ANYTHING -INEVER_MATCH_ANYTHING --auto-commit 
--before-build .
dpkg-buildpackage: info: host architecture amd64
dpkg-source: warning: --auto-commit is not a valid option for 
Dpkg::Source::Package::V3::Native
 debian/rules clean
make[1]: Entering directory 
'/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/packages/checks/debhelper/compat-level-not-a-number/compat-level-not-a-number-1.0'
debian/rules:7: target 'clean' does not exist
dh clean
dh: error: The environment variable DH_COMPAT must be a positive integer
make[1]: *** [debian/rules:7: clean] Error 25
make[1]: Leaving directory 
'/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/packages/checks/debhelper/compat-level-not-a-number/compat-level-not-a-number-1.0'
dpkg-buildpackage: error: debian/rules clean subprocess returned exit status 2
make: *** 
[/tmp/autopkgtest-lxc.6gdrvu2z/downtmp/autopkgtest_tmp/build-and-evaluate-test-packages/package-sources/checks/debhelper/compat-level-not-a-number/Makefile:39:
 compat-level-not-a-number_1.0_amd64.changes] Error 2

Gbp-Dch: ignore

- - - - -


7 changed files:

- lib/Lintian/Check/Debhelper.pm
- − 
t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/debian/compat.in
- − t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/debian/rules
- − t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/fill-values
- − t/recipes/checks/debhelper/compat-level-not-a-number/eval/desc
- − t/recipes/checks/debhelper/compat-level-not-a-number/eval/hints
- − tags/d/debhelper-compatibility-level-not-a-number.tag


Changes:

=====================================
lib/Lintian/Check/Debhelper.pm
=====================================
@@ -606,13 +606,6 @@ sub source {
     # prefers DH_COMPAT over debian/compat
     $debhelper_level ||= $from_compat_file;
 
-    if (length $debhelper_level && $debhelper_level !~ m/^\d+$/) {
-
-        $self->hint('debhelper-compatibility-level-not-a-number',
-            $debhelper_level);
-        $debhelper_level =~ s/[^\d]//g;
-    }
-
     $self->hint('debhelper-compat-level', $debhelper_level)
       if length $debhelper_level;
 


=====================================
t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/debian/compat.in
 deleted
=====================================
@@ -1 +0,0 @@
-[% $dh_compat_level %]


=====================================
t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/debian/rules 
deleted
=====================================
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export DH_COMPAT=11a
-
-%:
-       dh $@
-


=====================================
t/recipes/checks/debhelper/compat-level-not-a-number/build-spec/fill-values 
deleted
=====================================
@@ -1,4 +0,0 @@
-Testname: compat-level-not-a-number
-Skeleton: upload-native
-Description: Test if the value of DH_COMPAT is a number
-Default-Build-Depends: debhelper (>= [% $dh_compat_level %]~)


=====================================
t/recipes/checks/debhelper/compat-level-not-a-number/eval/desc deleted
=====================================
@@ -1,2 +0,0 @@
-Testname: compat-level-not-a-number
-Check: debhelper


=====================================
t/recipes/checks/debhelper/compat-level-not-a-number/eval/hints deleted
=====================================
@@ -1,6 +0,0 @@
-compat-level-not-a-number (source): uses-debhelper-compat-file [debian/compat]
-compat-level-not-a-number (source): package-uses-old-debhelper-compat-version 
11
-compat-level-not-a-number (source): 
declares-possibly-conflicting-debhelper-compat-versions 13 vs elsewhere 11a 
[debian/compat]
-compat-level-not-a-number (source): debian-build-system dh [debian/rules]
-compat-level-not-a-number (source): debhelper-compatibility-level-not-a-number 
11a
-compat-level-not-a-number (source): debhelper-compat-level 11


=====================================
tags/d/debhelper-compatibility-level-not-a-number.tag deleted
=====================================
@@ -1,8 +0,0 @@
-Tag: debhelper-compatibility-level-not-a-number
-Severity: error
-Check: debhelper
-Explanation: The debhelper compatibility level specified in 
<code>debian/rules</code>
- is not a number. If you're using make functions or other more complex
- methods to generate the compatibility level, write the output into
- <code>debian/compat</code> instead of setting DH&lowbar;COMPAT. The latter 
should
- be available for a user to override temporarily.



View it on GitLab: 
https://salsa.debian.org/lintian/lintian/-/commit/3db40eda23216dc10b1e30c391a2c909c69ccbec

-- 
View it on GitLab: 
https://salsa.debian.org/lintian/lintian/-/commit/3db40eda23216dc10b1e30c391a2c909c69ccbec
You're receiving this email because of your account on salsa.debian.org.


Reply via email to