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

[SCM] Debian package checker branch, master, updated. 2.5.10-23-g85b8dce



The following commit has been merged in the master branch:
commit e579e719d83175e371f2cea1576bd6182f69a7ed
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 11 20:15:17 2012 +0200

    c/init.d: Remove use of $_ set outside sub using it
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/init.d b/checks/init.d
index be04e91..1eebadf 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -242,11 +242,11 @@ sub check_init {
     my %needs_fs = ('remote' => 0, 'local' => 0);
     while (defined(my $l = <IN>)) {
         if ($. == 1 && $l =~ m,^\#!\s*(/usr/[^\s]+),) {
-            tag 'init.d-script-uses-usr-interpreter', "etc/init.d/$_ $1";
+            tag 'init.d-script-uses-usr-interpreter', "etc/init.d/$initd_file $1";
         }
         if ($l =~ m/^\#\#\# BEGIN INIT INFO/) {
             if ($lsb{BEGIN}) {
-                tag 'init.d-script-has-duplicate-lsb-section', "etc/init.d/$_";
+                tag 'init.d-script-has-duplicate-lsb-section', "etc/init.d/$initd_file";
                 next;
             }
             $lsb{BEGIN} = 1;
@@ -259,14 +259,14 @@ sub check_init {
                     $lsb{END} = 1;
                     last;
                 } elsif ($l !~ /^\#/) {
-                    tag 'init.d-script-has-unterminated-lsb-section', "etc/init.d/$_:$.";
+                    tag 'init.d-script-has-unterminated-lsb-section', "etc/init.d/${initd_file}:$.";
                     last;
                 } elsif ($l =~ /^\# ([a-zA-Z-]+):\s*(.*?)\s*$/) {
                     my $keyword = lc $1;
                     my $value = $2;
-                    tag 'init.d-script-has-duplicate-lsb-keyword', "etc/init.d/$_:$. $keyword"
+                    tag 'init.d-script-has-duplicate-lsb-keyword', "etc/init.d/${initd_file}:$. $keyword"
                         if (defined $lsb{$keyword});
-                    tag 'init.d-script-has-unknown-lsb-keyword', "etc/init.d/$_:$. $keyword"
+                    tag 'init.d-script-has-unknown-lsb-keyword', "etc/init.d/${initd_file}:$. $keyword"
                         unless (defined ($lsb_keywords{$keyword}) || $keyword =~ /^x-/);
                     $lsb{$keyword} = defined($value) ? $value : '';
                     $last = $keyword;
@@ -275,7 +275,7 @@ sub check_init {
                     $value =~ s/^\#\s*//;
                     $lsb{description} .= ' ' . $value;
                 } else {
-                    tag 'init.d-script-has-bad-lsb-line', "etc/init.d/$_:$.";
+                    tag 'init.d-script-has-bad-lsb-line', "etc/init.d/${initd_file}:$.";
                 }
             }
         }
@@ -285,7 +285,7 @@ sub check_init {
         $in_file_test = 1 if ($l =~ m/\bif\s+.*?(?:test|\[)(?:\s+\!)?\s+-[efr]\s+/);
         $in_file_test = 0 if ($l =~ m/\bfi\b/);
         if (!$in_file_test && $l =~ m,^\s*\.\s+["'"]?(/etc/default/[\$\w/-]+),) {
-            tag 'init.d-script-sourcing-without-test', "etc/init.d/$_:$. $1";
+            tag 'init.d-script-sourcing-without-test', "etc/init.d/${initd_file}:$. $1";
         }
 
         # This should be more sophisticated: ignore heredocs, ignore quoted
@@ -301,16 +301,16 @@ sub check_init {
 
     # Make sure all of the required keywords are present.
     if (not $lsb{BEGIN}) {
-        tag 'init.d-script-missing-lsb-section', "etc/init.d/$_";
+        tag 'init.d-script-missing-lsb-section', "etc/init.d/${initd_file}";
     } else {
         for my $keyword (keys %lsb_keywords) {
             if ($lsb_keywords{$keyword} && !defined $lsb{$keyword}) {
                 if ($keyword eq 'short-description') {
-                    tag 'init.d-script-missing-lsb-short-description', "etc/init.d/$_";
+                    tag 'init.d-script-missing-lsb-short-description', "etc/init.d/${initd_file}";
                 } elsif ($keyword eq 'description') {
-                    tag 'init.d-script-missing-lsb-description', "etc/init.d/$_";
+                    tag 'init.d-script-missing-lsb-description', "etc/init.d/${initd_file}";
                 } else {
-                    tag 'init.d-script-missing-lsb-keyword', "etc/init.d/$_ $keyword";
+                    tag 'init.d-script-missing-lsb-keyword', "etc/init.d/${initd_file} $keyword";
                 }
             }
         }
@@ -324,10 +324,10 @@ sub check_init {
                 $start{lc $runlevel} = 1;
                 if ($runlevel eq '0' or $runlevel eq '6') {
                     tag 'init.d-script-starts-in-stop-runlevel',
-                        "etc/init.d/$_", $runlevel;
+                        "etc/init.d/${initd_file}", $runlevel;
                 }
             } else {
-                tag 'init.d-script-has-bad-start-runlevel', "etc/init.d/$_",
+                tag 'init.d-script-has-bad-start-runlevel', "etc/init.d/${initd_file}",
                     $runlevel;
             }
         }
@@ -339,7 +339,7 @@ sub check_init {
             my $base = $initd_file;
             $base =~ s,.*/,,;
             my @missing = grep { !defined $start{$_} } qw(2 3 4 5);
-            tag 'init.d-script-missing-start', "etc/init.d/$_",
+            tag 'init.d-script-missing-start', "etc/init.d/${initd_file}",
                 @missing;
         }
     }
@@ -349,13 +349,13 @@ sub check_init {
             if ($runlevel =~ /^[sS0-6]$/) {
                 $stop{$runlevel} = 1 unless $runlevel =~ /[sS2-5]/;
                 if ($start{$runlevel}) {
-                    tag 'init.d-script-has-conflicting-start-stop', "etc/init.d/$_ $runlevel";
+                    tag 'init.d-script-has-conflicting-start-stop', "etc/init.d/${initd_file} $runlevel";
                 }
                 if ($runlevel =~ /[sS]/) {
-                    tag 'init-d-script-stops-in-s-runlevel', "etc/init.d/$_";
+                    tag 'init-d-script-stops-in-s-runlevel', "etc/init.d/${initd_file}";
                 }
             } else {
-                tag 'init.d-script-has-bad-stop-runlevel', "etc/init.d/$_ $runlevel";
+                tag 'init.d-script-has-bad-stop-runlevel', "etc/init.d/${initd_file} $runlevel";
             }
         }
 
@@ -367,7 +367,7 @@ sub check_init {
             $base =~ s,.*/,,;
             unless (grep { $base eq $_ } qw(killprocs sendsigs halt reboot)) {
                 my @missing = grep { !defined $stop{$_} } qw(0 1 6);
-                tag 'init.d-script-possible-missing-stop', "etc/init.d/$_",
+                tag 'init.d-script-possible-missing-stop', "etc/init.d/${initd_file}",
                     @missing;
             }
         }
@@ -377,13 +377,13 @@ sub check_init {
         for my $facility (split(/\s+/, $lsb{'provides'})) {
             if ($facility =~ /^\$/) {
                 tag 'init.d-script-provides-virtual-facility',
-                    "etc/init.d/$_", $facility;
+                    "etc/init.d/${initd_file}", $facility;
             }
-            if (/^\Q$facility\E(?:.sh)?$/) {
+            if ($initd_file =~/^\Q$facility\E(?:.sh)?$/) {
                 $provides_self = 1;
             }
         }
-        tag 'init.d-script-does-not-provide-itself', "etc/init.d/$_"
+        tag 'init.d-script-does-not-provide-itself', "etc/init.d/${initd_file}"
             unless $provides_self;
     }
 
@@ -399,13 +399,13 @@ sub check_init {
         if ($needs_fs{remote}) {
             unless (grep { /^\$(?:remote_fs|all)\z/ } @required) {
                 tag 'init.d-script-missing-dependency-on-remote_fs',
-                    "etc/init.d/$_: required-start";
+                    "etc/init.d/${initd_file}: required-start";
             }
         }
         if ($needs_fs{local}) {
             unless (grep { /^\$(?:local_fs|remote_fs|all)\z/ } @required) {
                 tag 'init.d-script-missing-dependency-on-local_fs',
-                    "etc/init.d/$_: required-start";
+                    "etc/init.d/${initd_file}: required-start";
             }
         }
     }
@@ -414,13 +414,13 @@ sub check_init {
         if ($needs_fs{remote}) {
             unless (grep { /^(?:\$remote_fs|\$all|umountnfs)\z/ } @required) {
                 tag 'init.d-script-missing-dependency-on-remote_fs',
-                    "etc/init.d/$_: required-stop";
+                    "etc/init.d/${initd_file}: required-stop";
             }
         }
         if ($needs_fs{local}) {
             unless (grep { /^(?:\$(?:local|remote)_fs|\$all|umountn?fs)\z/ } @required) {
                 tag 'init.d-script-missing-dependency-on-local_fs',
-                    "etc/init.d/$_: required-stop";
+                    "etc/init.d/${initd_file}: required-stop";
             }
         }
     }
@@ -431,11 +431,11 @@ sub check_init {
         for my $dependency (split(/\s+/, $lsb{$keyword})) {
             if (defined $implied_dependencies{$dependency}) {
                 tag 'init.d-script-should-depend-on-virtual-facility',
-                    "etc/init.d/$_",
+                    "etc/init.d/${initd_file}",
                     "$dependency -> $implied_dependencies{$dependency}";
             } elsif ($keyword =~ m/^required-/ && $dependency =~ m/^\$/) {
                 tag 'init.d-script-depends-on-unknown-virtual-facility',
-                    "etc/init.d/$_", $dependency
+                    "etc/init.d/${initd_file}", $dependency
                     unless ($VIRTUAL_FACILITIES->known($dependency));
             }
         }
@@ -444,12 +444,12 @@ sub check_init {
     # all tags included in file?
     for my $option (qw(start stop restart force-reload)) {
         $tag{$option}
-            or tag 'init.d-script-does-not-implement-required-option', "etc/init.d/$_ $option";
+            or tag 'init.d-script-does-not-implement-required-option', "etc/init.d/${initd_file} $option";
     }
 
     for my $option (qw(status)) {
         $tag{$option}
-            or tag 'init.d-script-does-not-implement-optional-option', "etc/init.d/$_ $option";
+            or tag 'init.d-script-does-not-implement-optional-option', "etc/init.d/${initd_file} $option";
     }
 }
 

-- 
Debian package checker


Reply to: