Bug#1030325: lintian: archive-liberty-mismatch (in section for firmware-nvidia-gsp) non-free-firmware vs non-free

[Andreas Beckmann <anbe@debian.org>]

On 03/02/2023 00.21, Cyril Brulebois wrote:
> > E: nvidia-graphics-drivers source: archive-liberty-mismatch (in section for firmware-nvidia-gsp) non-free-firmware vs non-free [debian/control:106]

>      for my $inferior_liberty ('non-free', 'contrib') {
> into this:
>      for my $inferior_liberty ('non-free-firmware', 'non-free', 'contrib') {

That doesn't work for me (but may be needed for other cases).

The attached patch does make the error go away by adding an exception 
for 'non-free-firmware build from non-free' similar to 'contrib built 
from main'

Andreas

--- /usr/share/lintian/lib/Lintian/Check/Archive/Liberty/Mismatch.pm.orig	2023-02-03 00:30:29.782861611 +0100
+++ /usr/share/lintian/lib/Lintian/Check/Archive/Liberty/Mismatch.pm	2023-02-03 01:02:12.441805855 +0100
@@ -87,6 +87,9 @@
         # special exception for contrib built from main
         next
           if $source_liberty eq 'main' && $installable_liberty eq 'contrib';
+        # and non-free-firmware built from non-free
+        next
+          if $source_liberty eq 'non-free' && $installable_liberty eq 'non-free-firmware';
 
         my $control_item= $self->processable->debian_control->item;
         my $position = $installable_fields->position('Section');