[lintian] 01/01: checks/scripts: Merge two checks for interpreter shipped in binary itself
This is an automated email from the git hooks/post-receive script.
jwilk pushed a commit to branch master
in repository lintian.
commit 7ce2db4a444f65af025d69b59b19abd3a0e85e19
Author: Jakub Wilk <jwilk@debian.org>
Date: Wed Jun 29 13:40:40 2016 +0200
checks/scripts: Merge two checks for interpreter shipped in binary itself
The first check didn't work, because it expected leading "./" in the
%executable hash.
---
checks/scripts.pm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/checks/scripts.pm b/checks/scripts.pm
index a2afaee..12f0cff 100644
--- a/checks/scripts.pm
+++ b/checks/scripts.pm
@@ -371,9 +371,6 @@ sub run {
}
} elsif ($interpreter =~ m,/usr/local/,) {
script_tag('interpreter-in-usr-local', $filename,"#!$interpreter");
- } elsif ($executable{'.' . $interpreter}) {
- # Package installs the interpreter itself, so it's probably ok. Don't
- # emit any tag for this.
} elsif ($interpreter eq '/bin/env') {
script_tag('script-uses-bin-env', $filename);
} else {
@@ -382,8 +379,7 @@ sub run {
# Check if the package ships the interpreter (and it is
# executable).
my $interfile = substr $interpreter, 1;
- my $index_info = $info->index($interfile);
- $pinter = 1 if $index_info && ($index_info->operm & 0111);
+ $pinter = 1 if $executable{$interfile};
}
script_tag('unusual-interpreter', $filename, "#!$interpreter")
unless $pinter;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: