From c97259e569fbfd78c4c1c415a00e66fa69cf7c80 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Thu, 15 Oct 2020 17:04:48 +0100 Subject: drakhardware: fix hardware support package detection (mga#27122) This bug was caused by the introduction of TYPE"64bit" in rpmsrate. The code in pkgs::read_rpmsrate() marked any package flagged as TYPE"some type" as being a hardware support package. drakhardware checks and ensures that all hardware support packages are installed, so was wrongly selecting packages such as lsb-lib64 and lsb-core-lib64 which are flagged as TYPE"64bit". --- perl-install/pkgs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 504e30705..892f758da 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -125,7 +125,7 @@ sub read_rpmsrate { $match_all_hardware ? 1 : ($inv xor find { $_->{description} =~ /$p/i } @probeall); } elsif (($p) = /^DRIVER"(.*)"/) { $match_all_hardware ? 1 : ($inv xor find { $_->{driver} =~ /$p/i } @probeall); - } elsif (($p) = /^TYPE"(.*)"/) { + } elsif (($p) = /^TYPE"(.*)"/ && $p ne '64bit') { $match_all_hardware ? 1 : ($inv xor $TYPEs->{$p}); } elsif (($p) = /^HW_CAT"(.*)"/) { $match_all_hardware ? 1 : ($inv xor detect_devices::probe_category($p)); -- cgit v1.2.1