[lintian] 01/01: Pass linelength downstream to tag
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 3cf1b70e867104b8722bb3d9b9e9e8dfbcaaf6fb
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Sun Jan 3 14:05:39 2016 +0100
Pass linelength downstream to tag
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/cruft.pm | 16 ++++++++++------
debian/changelog | 6 +++++-
t/tests/cruft-minified-js/tags | 2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 628dae9..261b1e2 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -753,7 +753,10 @@ sub find_cruft {
# try to check if source is missing
sub check_missing_source {
- my ($file, $info, $name, $basename, $dirname,$replacementspairref) = @_;
+ my ($file, $info, $name, $basename, $dirname,$replacementspairref,
+ $extratext)
+ = @_;
+ $extratext //= '';
# do not check missing source for non free
if($info->is_non_free) {
@@ -819,7 +822,7 @@ sub check_missing_source {
}
}
}
- tag 'source-is-missing', $name;
+ tag 'source-is-missing', $name, $extratext;
return;
}
@@ -943,13 +946,14 @@ sub _search_in_block0 {
# warn about prebuilt javascript and check missing source
sub _warn_prebuilt_javascript{
my ($entry, $info, $name, $basename, $dirname,$linelength,$cutoff) = @_;
- tag 'source-contains-prebuilt-javascript-object',
- $name, 'line length is', int($linelength),
- "characters (>$cutoff)";
+ my $extratext
+ = 'line length is '.int($linelength)." characters (>$cutoff)";
+ tag 'source-contains-prebuilt-javascript-object',$name,$extratext;
# Check for missing source. It will check
# for the source file in well known directories
check_missing_source($entry,$info,$name,$basename,$dirname,
- [['(?i)\.js$','.debug.js'],['(?i)\.js$','-debug.js'],['','']]);
+ [['(?i)\.js$','.debug.js'],['(?i)\.js$','-debug.js'],['','']],
+ $extratext);
return;
}
diff --git a/debian/changelog b/debian/changelog
index 7e1f50f..60eafe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.40) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/cruft.pm:
+ + [BR] Pass information about minified javascript down to tag.
+ (Closes: #804147).
* checks/binaries.pm:
+ [JW] Exclude /usr/lib/debug/.build-id/ from foreign-architecture
checks. Thanks to Aurelien Jarno for the bug report. (Closes:
@@ -10,7 +13,8 @@ lintian (2.5.40) UNRELEASED; urgency=medium
* checks/source-copyright.desc:
+ [JW] Apply patch from Mattia Rizzolo to update the machine-readable
copyright format specification URL. (Closes: #809248)
- + [BR] Improve description text of dep5-copyright-license-name-not-unique.
+ + [BR] Improve description text of tag
+ dep5-copyright-license-name-not-unique.
(Closes: #809651).
* data/spelling/corrections*:
diff --git a/t/tests/cruft-minified-js/tags b/t/tests/cruft-minified-js/tags
index 5e12f35..9b0b38d 100644
--- a/t/tests/cruft-minified-js/tags
+++ b/t/tests/cruft-minified-js/tags
@@ -1,5 +1,5 @@
E: cruft-minified-js source: source-is-missing deployJava/deployJava.js
-E: cruft-minified-js source: source-is-missing usr/share/javascript/jswithoutminextwithoutsource/jsonnotsourced.js
+E: cruft-minified-js source: source-is-missing usr/share/javascript/jswithoutminextwithoutsource/jsonnotsourced.js line length is NUMBER characters (>CUTOFF)
E: cruft-minified-js source: source-is-missing usr/share/javascript/minwithoutsource/notsourced.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object oldfalsepositives/-debug.js/src/test-min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object oldfalsepositives/-nc.js/test-yc.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: