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

[SCM] Debian package checker branch, master, updated. 2.5.14-26-g1662c3e



The following commit has been merged in the master branch:
commit 2c0844e2fee2ff791cfe98f5feebcf840f589e18
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 30 22:01:03 2013 +0200

    c/systemd.pm: Ignore symlinks to upstart-job
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/systemd.pm b/checks/systemd.pm
index e0170c2..612beaf 100644
--- a/checks/systemd.pm
+++ b/checks/systemd.pm
@@ -97,11 +97,20 @@ sub check_init_script {
 
     my $unpacked_file = $info->unpacked ($file);
 
-    unless (-f $unpacked_file &&
-            is_ancestor_of ($info->unpacked, $unpacked_file)) {
-        tag 'init-script-is-not-a-file', $file;
-        return;
+    if ($file->is_symlink) {
+        # We cannot test upstart-jobs
+        return if $file->link eq '/lib/init/upstart-job';
+    }
+
+    if (!$file->is_regular_file) {
+        unless (-f $unpacked_file &&
+                is_ancestor_of($info->unpacked, $unpacked_file)) {
+            tag 'init-script-is-not-a-file', $file;
+            return;
+        }
+
     }
+
     open(my $fh, '<', $unpacked_file);
     while (<$fh>) {
         lstrip;

-- 
Debian package checker


Reply to: