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

[SCM] Debian package checker branch, master, updated. 2.5.11-154-gffcad55



The following commit has been merged in the master branch:
commit ffcad5519c93cd8e337d961f7270815188cc5de4
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Feb 13 23:47:24 2013 +0100

    coll (w. helpers): Move the "realpath(helper)" out of collect
    
    There is no reason to resolve the path to the helper script every time
    the collection is run.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/file-info b/collection/file-info
index e2f94bc..536c6c2 100755
--- a/collection/file-info
+++ b/collection/file-info
@@ -31,11 +31,12 @@ use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
 use Lintian::Util qw(fail);
 
+my $helper = realpath (__FILE__ . '-helper');
+
 sub collect {
 my ($pkg, $type, $dir) = @_;
 my $info = Lintian::Collect->new ($pkg, $type, $dir);
 
-my $helper = realpath (__FILE__ . '-helper');
 my $outfile = "$dir/file-info.gz";
 
 if ( -e "$dir/file-info" ) {
diff --git a/collection/hardening-info b/collection/hardening-info
index f6102ad..d40c825 100755
--- a/collection/hardening-info
+++ b/collection/hardening-info
@@ -39,12 +39,12 @@ use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
 use Lintian::Util qw(fail touch_file);
 
+my $helper = realpath (__FILE__ . '-helper');
+
 sub collect {
 my ($pkg, $type, $dir) = @_;
 my $info = Lintian::Collect->new ($pkg, $type, $dir);
 
-my $helper = realpath (__FILE__ . '-helper');
-
 if ( -e "$dir/hardening-info" ) {
     unlink "$dir/hardening-info" or fail "unlink hardening-info: $!";
 }
diff --git a/collection/objdump-info b/collection/objdump-info
index 17cd44e..617f7f4 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -36,10 +36,11 @@ use Lintian::Collect;
 use Lintian::Command qw(spawn reap);
 use Lintian::Util qw(fail);
 
+my $helper = realpath (__FILE__ . '-helper');
+
 sub collect {
 my ($pkg, $type, $dir) = @_;
 my $info = Lintian::Collect->new ($pkg, $type, $dir);
-my $helper = realpath (__FILE__ . '-helper');
 
 if ( -e "$dir/objdump-info" ) {
     unlink "$dir/objdump-info" or fail "unlink objdump-info: $!"
diff --git a/collection/strings b/collection/strings
index 84213b2..5f3e0b9 100755
--- a/collection/strings
+++ b/collection/strings
@@ -33,12 +33,12 @@ use Lintian::Command qw(spawn reap);
 use Lintian::Util qw(delete_dir fail);
 
 
+my $helper = realpath(__FILE__ . '-helper');
+
 sub collect {
 
 my ($pkg, $type, $dir) = @_;
 my $info = Lintian::Collect->new ($pkg, $type, $dir);
-
-my $helper = realpath(__FILE__ . '-helper');
 my @manual = ();
 
 if ( -e "$dir/elf-index" ) {

-- 
Debian package checker


Reply to: