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

lintian: r20 - in trunk: checks debian testset testset/filenames/debian



Author: jeroen
Date: 2004-02-09 00:12:24 +0100 (Mon, 09 Feb 2004)
New Revision: 20

Modified:
   trunk/checks/files
   trunk/debian/changelog
   trunk/testset/filenames/debian/rules
   trunk/testset/info_tags.filenames
   trunk/testset/tags.filenames
Log:
checks/filenames (and more):
+ Ignore empty __init__.py files in /usr/share/doc (Closes: #215234)
  (based on patch by Frank Lichtenheld <djpig@debian.org>)


Modified: trunk/checks/files
===================================================================
--- trunk/checks/files	2004-02-08 22:52:57 UTC (rev 19)
+++ trunk/checks/files	2004-02-08 23:12:24 UTC (rev 20)
@@ -154,7 +154,11 @@
 
 	    # zero byte file in /usr/share/doc/
 	    if ($size == 0 and $perm =~ m,^-,) {
-		print "W: $pkg $type: zero-byte-file-in-doc-directory $file\n";
+		# exception: __init__.py files are empty tagging files (see
+		# bug #215234)
+		unless ($file =~ m,^usr/share/doc/([^/]+/)?examples/(.+/)?__init__\.py$,) {
+		    print "W: $pkg $type: zero-byte-file-in-doc-directory $file\n";
+		}
 	    }
 
 	    # override files have moved

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-08 22:52:57 UTC (rev 19)
+++ trunk/debian/changelog	2004-02-08 23:12:24 UTC (rev 20)
@@ -15,6 +15,8 @@
      + Fix typo (Closes: #202856)
    * checks/filenames (and more):
      + Check for Subversion version control leftovers (Closes: #190067)
+     + Ignore empty __init__.py files in /usr/share/doc (Closes: #215234)
+       (based on patch by Frank Lichtenheld <djpig@debian.org>)
 
   Frank Lichtenheld <djpig@debian.org>
    * checks/debhelper:
@@ -32,7 +34,7 @@
      + fix testing of dependencies to eliminate false
        positives of missing-debconf-dependency (Closes: #195201)
 
- -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Sun,  8 Feb 2004 23:49:47 +0100
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Mon,  9 Feb 2004 00:10:15 +0100
 
 lintian (1.22.9) unstable; urgency=low
 

Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules	2004-02-08 22:52:57 UTC (rev 19)
+++ trunk/testset/filenames/debian/rules	2004-02-08 23:12:24 UTC (rev 20)
@@ -38,6 +38,9 @@
 	touch debian/tmp/usr/lib/perl5/foo/.packlist
 	chmod 644 debian/tmp/usr/lib/perl5/foo/.packlist
 	install -d debian/tmp/usr/share/doc/filenames
+	install -d debian/tmp/usr/share/doc/filenames/examples
+	touch debian/tmp/usr/share/doc/filenames/examples/__init__.py
+	touch debian/tmp/usr/share/doc/filenames/examples/very_interesting_example
 	touch debian/tmp/usr/share/doc/filenames/Changes
 	chmod 644 debian/tmp/usr/share/doc/filenames/Changes
 	gzip -9 debian/tmp/usr/share/doc/filenames/Changes

Modified: trunk/testset/info_tags.filenames
===================================================================
--- trunk/testset/info_tags.filenames	2004-02-08 22:52:57 UTC (rev 19)
+++ trunk/testset/info_tags.filenames	2004-02-08 23:12:24 UTC (rev 20)
@@ -58,6 +58,10 @@
 N:   Package contains a CVS directory. It was most likely installed by
 N:   accident, since transient CVS data usually doesn't belong in packages.
 N:
+W: filenames: zero-byte-file-in-doc-directory usr/share/doc/filenames/examples/very_interesting_example
+N:
+N:   Package contains a file which is empty.
+N:
 W: filenames: lengthy-symlink usr/share/doc/filenames/version.txt.gz ../filenames/doc/version6.txt.gz
 N:
 N:   This link goes up, and then back down into the same subdirectory.

Modified: trunk/testset/tags.filenames
===================================================================
--- trunk/testset/tags.filenames	2004-02-08 22:52:57 UTC (rev 19)
+++ trunk/testset/tags.filenames	2004-02-08 23:12:24 UTC (rev 20)
@@ -9,6 +9,7 @@
 E: filenames: package-installs-packlist usr/lib/perl5/foo/.packlist
 W: filenames: package-contains-svn-control-dir usr/lib/perl5/.svn/
 W: filenames: package-contains-CVS-dir usr/lib/perl5/CVS/
+W: filenames: zero-byte-file-in-doc-directory usr/share/doc/filenames/examples/very_interesting_example
 W: filenames: lengthy-symlink usr/share/doc/filenames/version.txt.gz ../filenames/doc/version6.txt.gz
 E: filenames: bad-menu-file-name usr/lib/menu/menu
 E: filenames: postinst-does-not-call-updatemenus usr/lib/menu/menu



Reply to: