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

lintian: r1199 - in trunk: checks debian testset



Author: djpig
Date: 2008-02-09 17:18:42 +0100 (Sat, 09 Feb 2008)
New Revision: 1199

Modified:
   trunk/checks/control-files
   trunk/checks/control-files.desc
   trunk/checks/md5sums
   trunk/checks/md5sums.desc
   trunk/debian/changelog
   trunk/testset/tags.binary
   trunk/testset/tags.scripts
Log:
* checks/control-files{.desc,}:
  + Warn about empty control files. I can't see any use for
    them. Exclude udebs though, since they might differ there.
* checks/md5sums{.desc,}:
  + Remove tag md5sums-control-file-is-empty in favour of
    a more general tag in control-files.


Modified: trunk/checks/control-files
===================================================================
--- trunk/checks/control-files	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/checks/control-files	2008-02-09 16:18:42 UTC (rev 1199)
@@ -86,6 +86,12 @@
 	}
     }
 
+    # I'm not sure about the udeb case
+    if ($type ne 'udeb' and $size == 0) {
+	tag "control-file-is-empty", "$file";
+    }
+
+
     # skip `control' control file (that's an exception: dpkg doesn't care and
     # this file isn't installed on the systems anyways)
     next if $file eq 'control';

Modified: trunk/checks/control-files.desc
===================================================================
--- trunk/checks/control-files.desc	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/checks/control-files.desc	2008-02-09 16:18:42 UTC (rev 1199)
@@ -18,6 +18,11 @@
  or .udeb packages and must not be included in packages of the other
  type. You should probably just remove the file.
 
+Tag: control-file-is-empty
+Type: warning
+Info: The package contains an empty control file, which is most probably
+ an error.
+
 Tag: control-file-has-bad-permissions
 Type: error
 Info: The postinst, postrm, preinst, and prerm control files should use

Modified: trunk/checks/md5sums
===================================================================
--- trunk/checks/md5sums	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/checks/md5sums	2008-02-09 16:18:42 UTC (rev 1199)
@@ -40,9 +40,8 @@
     return 0;
 }
 
-# Is it empty?
+# Is it empty? Then skip it. Tag will be issued by control-files
 if (-z $control) {
-    tag "md5sums-control-file-is-empty", "";
     return 0;
 }
 

Modified: trunk/checks/md5sums.desc
===================================================================
--- trunk/checks/md5sums.desc	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/checks/md5sums.desc	2008-02-09 16:18:42 UTC (rev 1199)
@@ -19,10 +19,6 @@
  <tt>dh_md5sums</tt> at the end of your binary-indep or binary-arch
  target, right before <tt>dh_builddeb</tt>.
 
-Tag: md5sums-control-file-is-empty
-Type: error
-Info: The package contains an md5sums control file, but it lists no files.
-
 Tag: malformed-md5sums-control-file
 Type: error
 Info: The indicated line of the md5sums control file for this package was

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/debian/changelog	2008-02-09 16:18:42 UTC (rev 1199)
@@ -1,5 +1,11 @@
 lintian (1.23.46) unstable; urgency=low
 
+  * checks/control-files{.desc,}:
+    + [FL] Warn about empty control files. I can't see any use for
+      them. Exclude udebs though, since they might differ there.
+  * checks/md5sums{.desc,}:
+    + [FL] Remove tag md5sums-control-file-is-empty in favour of
+      a more general tag in control-files.
   * checks/scripts{.desc,}:
     + [FL] Warn if a maintainer script is a valid shell script but
       doesn't seem to have any actual code.  Based on an idea

Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/testset/tags.binary	2008-02-09 16:18:42 UTC (rev 1199)
@@ -1,5 +1,4 @@
 E: binary source: debian-rules-missing-required-target binary-indep
-E: binary-data: md5sums-control-file-is-empty
 E: binary: debian-changelog-file-missing-or-wrong-name
 E: binary: debian-news-file-uses-obsolete-national-encoding at line 3
 E: binary: depends-on-x-metapackage depends: xorg
@@ -58,6 +57,7 @@
 W: binary source: not-binnmuable-any-depends-all binary -> binary-data
 W: binary source: substvar-source-version-is-deprecated binary
 W: binary source: substvar-source-version-is-deprecated binary-data
+W: binary-data: control-file-is-empty md5sums
 W: binary: binary-without-manpage usr/bin/hello
 W: binary: binary-without-manpage usr/bin/hello-static
 W: binary: binary-without-manpage usr/bin/hello.static

Modified: trunk/testset/tags.scripts
===================================================================
--- trunk/testset/tags.scripts	2008-02-09 15:58:00 UTC (rev 1198)
+++ trunk/testset/tags.scripts	2008-02-09 16:18:42 UTC (rev 1199)
@@ -46,6 +46,7 @@
 W: scripts: binary-without-manpage usr/bin/test.sh
 W: scripts: binary-without-manpage usr/bin/tkfoo
 W: scripts: binary-without-manpage usr/bin/wishfoo
+W: scripts: control-file-is-empty prerm
 W: scripts: executable-is-not-world-readable usr/bin/guile-bizarre 0705 != 0755
 W: scripts: executable-is-not-world-readable usr/bin/perl-bizarre-2 0750 != 0755
 W: scripts: executable-is-not-world-readable usr/bin/suidperlfoo2 4751


Reply to: