[lintian] 01/01: Detect non sourced mininifed js file with extension only in .js
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 131d8d2239f3e496be465982258d2163379a8390
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Sat Mar 22 13:05:15 2014 +0100
Detect non sourced mininifed js file with extension only in .js
Detect non sourced minified file without .min.js extension.
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/cruft.pm | 6 ++++--
t/tests/cruft-minified-js/pre_build | 5 ++++-
t/tests/cruft-minified-js/tags | 2 ++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index a972cea..42f8b1b 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -647,7 +647,7 @@ sub find_cruft {
}
close($fd);
}
- full_text_check($info, $name, $info->unpacked($entry));
+ full_text_check($entry, $info, $name, $info->unpacked($entry));
}
return;
}
@@ -722,7 +722,7 @@ sub check_missing_source {
# note that it does not replace licensecheck(1)
# and is only used for autoreject by ftp-master
sub full_text_check {
- my ($info, $name, $path) = @_;
+ my ($entry, $info, $name, $path) = @_;
my $isjsfile = ($name =~ m/\.js/) ? 1 : 0;
if($isjsfile) {
@@ -803,6 +803,8 @@ sub full_text_check {
tag 'source-contains-prebuilt-javascript-object',
$name, 'means line length is about', $linelength,
'characters';
+ # now check for missing source
+ check_missing_source($entry,$info);
}
}
}
diff --git a/t/tests/cruft-minified-js/pre_build b/t/tests/cruft-minified-js/pre_build
index cc4fd55..95257ce 100755
--- a/t/tests/cruft-minified-js/pre_build
+++ b/t/tests/cruft-minified-js/pre_build
@@ -15,13 +15,16 @@ mkdir -p "$jsdir/minwithoutsource"
mkdir -p "$jsdir/jswithoutminext"
mkdir -p "$jsdir/json"
mkdir -p "$jsdir/sourced"
+mkdir -p "$jsdir/jswithoutminextwithoutsource/"
# create a js file
uglifyjs -o "$uglyjson" "$json"
-# fake install
+# fake install of minified js without min.js
cp "$uglyjson" "$jsdir/jswithoutminext/json.js"
# fake not sourced
cp "$uglyjson" "$jsdir/minwithoutsource/notsourced.min.js"
+# fake install but not sourced
+cp "$uglyjson" "$jsdir/jswithoutminextwithoutsource/jsonnotsourced.js"
# fake source and min alon
cp "$uglyjson" "$jsdir/sourced/sourced.min.js"
cp "$json" "$jsdir/sourced/sourced.js"
diff --git a/t/tests/cruft-minified-js/tags b/t/tests/cruft-minified-js/tags
index 7633bce..38abea4 100644
--- a/t/tests/cruft-minified-js/tags
+++ b/t/tests/cruft-minified-js/tags
@@ -1,5 +1,7 @@
+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/minwithoutsource/notsourced.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/json/json.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/jswithoutminext/json.js means line is about NUMBER characters
+P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/jswithoutminextwithoutsource/jsonnotsourced.js means line is about NUMBER characters
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/minwithoutsource/notsourced.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/sourced/sourced.min.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: