lintian: r1241 - in trunk: checks debian lib testset/relations/debian

[rra@debian.org]

Author: rra
Date: 2008-03-03 23:53:46 +0100 (Mon, 03 Mar 2008)
New Revision: 1241

Modified:
   trunk/checks/control-file
   trunk/debian/changelog
   trunk/lib/Dep.pm
   trunk/testset/relations/debian/control
Log:
* checks/control-file:
  + [RA] Skip empty dependencies for stronger-dependency-implies-weaker.
* lib/Dep.pm:
  + [RA] Skip empty dependencies, avoiding false positives for
    stronger-dependency-implies-weaker.  Patch from Adam D. Barratt.
    (Closes: #469222)

Modified: trunk/checks/control-file
===================================================================
--- trunk/checks/control-file	2008-03-03 22:06:16 UTC (rev 1240)
+++ trunk/checks/control-file	2008-03-03 22:53:46 UTC (rev 1241)
@@ -89,6 +89,7 @@
         for my $weak (($strong + 1) .. $#dep_fields) {
             next unless $control->{$dep_fields[$weak]};
             for my $dependency (split /\s*,\s*/, $control->{$dep_fields[$weak]}) {
+                next unless $dependency;
                 tag "stronger-dependency-implies-weaker", $control->{package}, "$dep_fields[$strong] -> $dep_fields[$weak]", $dependency
                     if Dep::implies($parsed, Dep::parse($dependency));
             }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-03 22:06:16 UTC (rev 1240)
+++ trunk/debian/changelog	2008-03-03 22:53:46 UTC (rev 1241)
@@ -13,6 +13,8 @@
     + [RA] Accept (and ignore for now) the new Checksums-Sha1,
       Checksums-Sha256, and Checksums-Md5 fields in source packages.
       Thanks, Raphael Hertzog.  (Closes: #466979)
+  * checks/control-file:
+    + [RA] Skip empty dependencies for stronger-dependency-implies-weaker.
   * 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.
@@ -80,6 +82,10 @@
     + [RA] Fix option parsing bug leading lintian to incorrectly reject -a
       or -p without a package.
 
+  * lib/Dep.pm:
+    + [RA] Skip empty dependencies, avoiding false positives for
+      stronger-dependency-implies-weaker.  Patch from Adam D. Barratt.
+      (Closes: #469222)
   * lib/Spelling.pm:
     + [RA] Add another spelling correction.
     + [RA] Merriam-Webster and the OED have both given up on publically

Modified: trunk/lib/Dep.pm
===================================================================
--- trunk/lib/Dep.pm	2008-03-03 22:06:16 UTC (rev 1240)
+++ trunk/lib/Dep.pm	2008-03-03 22:53:46 UTC (rev 1241)
@@ -67,6 +67,7 @@
 sub parse {
     my @deps;
     for (split(/\s*,\s*/, $_[0])) {
+	next if /^$/;
 	my @alts;
 	if (/^perl\s+\|\s+perl5$/ or /^perl5\s+\|\s+perl\s+/) {
 	    $_ = 'perl5';
@@ -615,3 +616,9 @@
 }
 
 1;
+
+# Local Variables:
+# indent-tabs-mode: t
+# cperl-indent-level: 4
+# End:
+# vim: syntax=perl sw=4 ts=8

Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control	2008-03-03 22:06:16 UTC (rev 1240)
+++ trunk/testset/relations/debian/control	2008-03-03 22:53:46 UTC (rev 1241)
@@ -17,7 +17,7 @@
 Architecture: all
 Section: contrib/misc
 Pre-Depends: awk|gawk
-Depends: relations(<< 3), dpkg, bash (>> 2.0 ), mail-transport-agent, gawk | awk, foo (>> 2.0), foo (<< 2.2), coreutils, null (>= 0), ${misc:Depends}
+Depends: relations(<< 3), dpkg, bash (>> 2.0 ), mail-transport-agent, gawk | awk, foo (>> 2.0), foo (<< 2.2), coreutils, ,null (>= 0), ${misc:Depends}
 Provides: mail-reader
 Replaces: relations
 Conflicts: foobar (<< 5&5), foo, relations,