[lintian] 01/01: Add a classification tag for the control tarball compression format. (Closes: #889856)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 25fad35f5cf2a031c081a096cb0a3f2afa10ed55
Author: Chris Lamb <lamby@debian.org>
Date: Thu Feb 8 14:20:54 2018 +0000
Add a classification tag for the control tarball compression format. (Closes: #889856)
---
checks/deb-format.desc | 5 +++++
checks/deb-format.pm | 2 ++
debian/changelog | 2 ++
t/tests/control-file-rules-requires-root-binary-targets/desc | 4 +++-
t/tests/control-file-rules-requires-root-binary-targets/tags | 1 +
t/tests/control-file-rules-requires-root-no/desc | 4 +++-
t/tests/control-file-rules-requires-root-no/tags | 1 +
t/tests/debhelper-compat-old/desc | 2 ++
t/tests/debhelper-compat-old/tags | 1 +
9 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index cbee42c..6326608 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -94,3 +94,8 @@ Tag: data-tarball-compression-format
Severity: classification
Certainty: certain
Info: This is the compressor format used for the <tt>data.tar</tt> tarball.
+
+Tag: control-tarball-compression-format
+Severity: classification
+Certainty: certain
+Info: This is the compressor format used for the <tt>control.tar</tt> tarball.
diff --git a/checks/deb-format.pm b/checks/deb-format.pm
index 2dea157..1dabf62 100644
--- a/checks/deb-format.pm
+++ b/checks/deb-format.pm
@@ -131,6 +131,8 @@ sub run {
} elsif ($ctrl_member eq 'control.tar') {
tag 'uses-no-compression-for-control-tarball';
}
+ tag 'control-tarball-compression-format',
+ $ctrl_member =~ s/^control\.tar\.?//r || '(none)';
}
if (not defined($data_member)) {
diff --git a/debian/changelog b/debian/changelog
index 4c2b696..cf6b1ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ lintian (2.5.74) UNRELEASED; urgency=medium
* checks/deb-format.{desc,pm}:
+ [CL] Add a classification tag for the .deb data tarball compression
format. (Closes: #738442)
+ + [CL] Add a classification tag for the control tarball compression
+ format. (Closes: #889856)
* checks/fields.pm:
+ [CL] Avoid false positives when checking binary packages depending on
toolchain packages by ignoring packages starting with "dh-" or ending
diff --git a/t/tests/control-file-rules-requires-root-binary-targets/desc b/t/tests/control-file-rules-requires-root-binary-targets/desc
index b077dd5..5b27d20 100644
--- a/t/tests/control-file-rules-requires-root-binary-targets/desc
+++ b/t/tests/control-file-rules-requires-root-binary-targets/desc
@@ -3,4 +3,6 @@ Version: 1.0
Description: Test for "Rules-Requires-Root: binary-targets"
Options: -L +classification
Test-For:
- rules-requires-root-explicitly
+ data-tarball-compression-format
+ control-tarball-compression-format
+ rules-requires-root-explicitly
diff --git a/t/tests/control-file-rules-requires-root-binary-targets/tags b/t/tests/control-file-rules-requires-root-binary-targets/tags
index 9575057..d98c3b6 100644
--- a/t/tests/control-file-rules-requires-root-binary-targets/tags
+++ b/t/tests/control-file-rules-requires-root-binary-targets/tags
@@ -1,5 +1,6 @@
C: control-file-rules-requires-root-binary-targets source: debian-build-system dh
C: control-file-rules-requires-root-binary-targets source: rules-requires-root-explicitly
C: control-file-rules-requires-root-binary-targets source: source-format 1.0 [non-native]
+C: control-file-rules-requires-root-binary-targets: control-tarball-compression-format xz
C: control-file-rules-requires-root-binary-targets: data-tarball-compression-format xz
C: control-file-rules-requires-root-binary-targets: no-ctrl-scripts
diff --git a/t/tests/control-file-rules-requires-root-no/desc b/t/tests/control-file-rules-requires-root-no/desc
index 1469229..f79426e 100644
--- a/t/tests/control-file-rules-requires-root-no/desc
+++ b/t/tests/control-file-rules-requires-root-no/desc
@@ -3,4 +3,6 @@ Version: 1.0
Description: Test for "Rules-Requires-Root: no"
Options: -L +classification
Test-For:
- rules-does-not-require-root
+ control-tarball-compression-format
+ data-tarball-compression-format
+ rules-does-not-require-root
diff --git a/t/tests/control-file-rules-requires-root-no/tags b/t/tests/control-file-rules-requires-root-no/tags
index 8aab9a8..82e9e91 100644
--- a/t/tests/control-file-rules-requires-root-no/tags
+++ b/t/tests/control-file-rules-requires-root-no/tags
@@ -1,5 +1,6 @@
C: control-file-rules-requires-root-no source: debian-build-system dh
C: control-file-rules-requires-root-no source: rules-does-not-require-root
C: control-file-rules-requires-root-no source: source-format 1.0 [non-native]
+C: control-file-rules-requires-root-no: control-tarball-compression-format xz
C: control-file-rules-requires-root-no: data-tarball-compression-format xz
C: control-file-rules-requires-root-no: no-ctrl-scripts
diff --git a/t/tests/debhelper-compat-old/desc b/t/tests/debhelper-compat-old/desc
index 0e1d823..2123b10 100644
--- a/t/tests/debhelper-compat-old/desc
+++ b/t/tests/debhelper-compat-old/desc
@@ -5,6 +5,8 @@ Skeleton: pedantic
Options: --pedantic -I -E -L +classification
Profile: lintian-test
Test-For:
+ control-tarball-compression-format
+ data-tarball-compression-format
package-uses-old-debhelper-compat-version
debian-build-system
rules-does-not-require-root
diff --git a/t/tests/debhelper-compat-old/tags b/t/tests/debhelper-compat-old/tags
index 189ddf0..a02f934 100644
--- a/t/tests/debhelper-compat-old/tags
+++ b/t/tests/debhelper-compat-old/tags
@@ -1,6 +1,7 @@
C: debhelper-compat-old source: debian-build-system dh
C: debhelper-compat-old source: rules-does-not-require-root
C: debhelper-compat-old source: source-format 1.0 [non-native]
+C: debhelper-compat-old: control-tarball-compression-format xz
C: debhelper-compat-old: data-tarball-compression-format xz
C: debhelper-compat-old: no-ctrl-scripts
P: debhelper-compat-old source: package-uses-old-debhelper-compat-version 8
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: