Bug#890361: lintian: handling of new source override location possibly buggy

[Chris Lamb <lamby@debian.org>]

tags 890361 + patch
thanks

Hey Thorsten!

> I’m fairly sure the code around lines 56-62 of
> /usr/share/lintian/collection/override-file
> does NOT prefer the first (cf. line 44ff.)
> but the last override file found.

I think you're right. Here's one patch - can you quickly test it works
for you?

  diff --git a/collection/override-file b/collection/override-file
  index 04c43fc6d..70ad1fb35 100755
  --- a/collection/override-file
  +++ b/collection/override-file
  @@ -59,6 +59,7 @@ sub collect {
           } elsif (-f "$override.gz") {
               $file = "$override.gz";
           }
  +        last if $file;
       }
   

… but, just for giggles, here's another silly one:

  diff --git a/collection/override-file b/collection/override-file
  index 04c43fc6d..b6bad50a5 100755
  --- a/collection/override-file
  +++ b/collection/override-file
  @@ -41,14 +41,14 @@ sub collect {
           unlink("$dir/override");
       }
   
  -    # Pick the first of these files that exists.  Prefer
  +    # Pick the last of these files that exists.  Prefer
       # source/lintian-overrides to source.lintian-overrides for source
       # packages.
       my (@overrides, $file);
       if ($type eq 'source') {
           @overrides = (
  -            "$dir/unpacked/debian/source/lintian-overrides",
               "$dir/unpacked/debian/source.lintian-overrides"
  +            "$dir/unpacked/debian/source/lintian-overrides",
           );
       } else {
           @overrides = ("$dir/unpacked/usr/share/lintian/overrides/$pkg");


> I’m a tad annoyed at such incompatible changes,
> but also (not scope of this bugreport) having to
> jump to the latest debhelper version when 5 is
> enough for me.

Compat level 5 (!).  (What's wrong with the  debhelper versions in
backports, out of interest?)


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-