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

[lintian] 01/03: data/rules/rules-should-not-use: Add more context to xz-compression-level-too-high tag output.



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 2cc90f118a96288e168d1d143212a22e4b477aec
Author: Chris Lamb <lamby@debian.org>
Date:   Sat Jan 20 16:32:27 2018 +1100

    data/rules/rules-should-not-use: Add more context to xz-compression-level-too-high tag output.
---
 data/rules/rules-should-not-use                                 | 2 +-
 debian/changelog                                                | 3 +++
 t/tests/rules-xz-compression-level-too-high/debian/debian/rules | 2 ++
 t/tests/rules-xz-compression-level-too-high/tags                | 6 ++++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/rules/rules-should-not-use b/data/rules/rules-should-not-use
index 47cab90..1c76a3a 100644
--- a/data/rules/rules-should-not-use
+++ b/data/rules/rules-should-not-use
@@ -9,4 +9,4 @@ debian-rules-should-not-use-DH_EXTRA_ADDONS              ~~ ^\s*DH_EXTRA_ADDONS\
 debian-rules-should-not-use-or-modify-user-only-variable ~~ \bDEB_[^_ \t]+FLAGS_(?:SET|APPEND)\b
 debian-rules-should-not-use-pwd                          ~~ \$[\(\{]PWD[\)\}]
 debian-rules-should-not-use-underscore-variable          ~~ \$[\(\{]_[\)\}]
-xz-compression-level-too-high                            ~~ dh_builddeb\b.*--.*(?:-z\s*(?<info>9).*-Z\s*xz|-Z\s*xz.*-z\s*(?<info>9))
+xz-compression-level-too-high                            ~~ (?<info>dh_builddeb\b.*--.*(?:-z\s*9.*-Z\s*xz|-Z\s*xz.*-z\s*9)\S*)
diff --git a/debian/changelog b/debian/changelog
index 585dc6a..d21f932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ lintian (2.5.71) UNRELEASED; urgency=medium
   * checks/files.pm:
     + [CL] Ignore Rust .rs files in extra-license-file.  (Closes: #887715)
 
+  * data/rules/rules-should-not-use:
+    + [CL] Add more context to xz-compression-level-too-high tag output.
+
   * lib/Lintian/Collect/Package.pm:
     + [CL] Fix "Use of uninitialized value in string ne" warnings that
       would have appeared as part of the src-orig-index handling in 2.5.66.
diff --git a/t/tests/rules-xz-compression-level-too-high/debian/debian/rules b/t/tests/rules-xz-compression-level-too-high/debian/debian/rules
index 6034196..fbbdc99 100755
--- a/t/tests/rules-xz-compression-level-too-high/debian/debian/rules
+++ b/t/tests/rules-xz-compression-level-too-high/debian/debian/rules
@@ -8,3 +8,5 @@ override_dh_builddeb:
 	dh_builddeb -- -z9 -Z xz
 	dh_builddeb -- -z8 -Z xz
 	dh_builddeb -- -z9 -Zgzip
+	dh_builddeb -- -Zxz -Sextreme -z9
+	dh_builddeb -- -Zxz -z9 -Sextreme
diff --git a/t/tests/rules-xz-compression-level-too-high/tags b/t/tests/rules-xz-compression-level-too-high/tags
index 1a30024..acc78b9 100644
--- a/t/tests/rules-xz-compression-level-too-high/tags
+++ b/t/tests/rules-xz-compression-level-too-high/tags
@@ -1,2 +1,4 @@
-W: rules-xz-compression-level-too-high source: xz-compression-level-too-high 9 (line 7)
-W: rules-xz-compression-level-too-high source: xz-compression-level-too-high 9 (line 8)
+W: rules-xz-compression-level-too-high source: xz-compression-level-too-high dh_builddeb --  -Zxz  -z 9 (line 7)
+W: rules-xz-compression-level-too-high source: xz-compression-level-too-high dh_builddeb -- -Zxz -Sextreme -z9 (line 11)
+W: rules-xz-compression-level-too-high source: xz-compression-level-too-high dh_builddeb -- -Zxz -z9 (line 12)
+W: rules-xz-compression-level-too-high source: xz-compression-level-too-high dh_builddeb -- -z9 -Z xz (line 8)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: