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

[SCM] Debian package checker branch, master, updated. 2.5.4-87-g3519b58



The following commit has been merged in the master branch:
commit 3519b58d2a68bd4f09d98edc2fc8b0cfcd47b076
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jan 18 10:40:09 2012 +0100

    Properly strip comments and empty lines from suppress tags files
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/frontend/lintian b/frontend/lintian
index e7b6e8a..723e39f 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -321,10 +321,10 @@ sub record_suppress_tags_from_file {
     open(my $file, '<', $name)
         or die("failed to open $name: $!");
     for my $line (<$file>) {
+        chomp $line;
         $line =~ s/^\s+//;
-        $line =~ s/\s+$//;
+        $line =~ s/(\#.*+|\s+)$//; #Remove trailing white-space/comments
         next unless $line;
-        next if $line eq '';
         record_suppress_tags($option, $line);
     }
     close $file;

-- 
Debian package checker


Reply to: