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

[SCM] Debian package checker branch, master, updated. 2.5.1-35-gd09485d



The following commit has been merged in the master branch:
commit d09485d426eab86e61e3f15ec6d3174629a8924f
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 6 09:13:56 2011 +0200

    Exclude __init__.py from the duplicate-files check
    
    They are required to be present even if they are empty.

diff --git a/checks/duplicate-files b/checks/duplicate-files
index 696abf3..f6b9875 100644
--- a/checks/duplicate-files
+++ b/checks/duplicate-files
@@ -39,6 +39,9 @@ foreach my $file (@{ $info->sorted_index }){
     next unless defined $md5;
     next unless $info->index->{$file}->{type} eq '-';
     next unless $file =~ m@usr/share/doc/@o;
+    # skip __init__.py files; if they trigger this, they are
+    # most likely empty (see #632789)
+    next if $file =~ m,/__init__\.py$,o;
     $fs = $hashmap{$md5};
     unless (defined $fs){
         $fs = [$file];
diff --git a/debian/changelog b/debian/changelog
index cfc54e9..c0ef520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,10 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Do not trigger deprecation warning for dh_python-ply,
       which Lintian incorrectly identified as dh_python.  Thanks
       to Daniele Tricoli for the report.  (Closes: #632693)
+  * checks/duplicate-files:
+    + [NT] Exclude  __init__.py files from the check as they are
+      required even if they are empty.  Thanks to Daniele Tricoli
+      for the report.  (Closes: #632789)
   * checks/filename-length{,.desc}:
     + [NT] New file that checks the length of the package file
       names.  (Closes: #631656)

-- 
Debian package checker


Reply to: