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

[SCM] Debian package checker branch, master, updated. 2.5.5-20-g723879e



The following commit has been merged in the master branch:
commit 723879e9024c8c8f136f8561f7e50d1086d972a9
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Mar 11 12:46:35 2012 +0100

    c/debhelper: Skip directories when looking for dh files
    
    This prevents Lintian from trying to open directories as files, when a
    directory has the same name as certain debhelper files.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/debhelper b/checks/debhelper
index 495fbf0..ed93652 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -296,7 +296,7 @@ my @indebfiles = ();
 opendir(DEBIAN, $droot)
     or fail("Can't open debfiles directory.");
 foreach my $file (sort readdir(DEBIAN)) {
-    next if $file eq 'rules';
+    next if $file eq 'rules' or not -f "$droot/$file";
     if ($file =~ m/^(?:(.*)\.)?(?:post|pre)(?:inst|rm)$/) {
         next unless $needtomodifyscripts;
 
@@ -344,7 +344,7 @@ foreach my $file (sort readdir(DEBIAN)) {
                 # debhelper only use executable files in compat 9
                 _tag_if_executable ($file, "$droot/$file");
             } else {
-                if (-f "$droot/$file" && -x "$droot/$file") {
+                if ( -x "$droot/$file") {
                     my $cmd =  _shebang_cmd  ("debian/$file", "$droot/$file");
                     unless ( $cmd ) {
                         tag 'executable-debhelper-file-without-being-executable', "debian/$file";

-- 
Debian package checker


Reply to: