diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-10-15 17:04:48 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-10-15 17:10:19 +0100 |
| commit | c97259e569fbfd78c4c1c415a00e66fa69cf7c80 (patch) | |
| tree | cc88b5f512e7e044328248147f81f71180fd7590 /perl-install | |
| parent | f7a220dee3a046c616525ec2a0cf0e0b78259737 (diff) | |
| download | drakx-c97259e569fbfd78c4c1c415a00e66fa69cf7c80.tar drakx-c97259e569fbfd78c4c1c415a00e66fa69cf7c80.tar.gz drakx-c97259e569fbfd78c4c1c415a00e66fa69cf7c80.tar.bz2 drakx-c97259e569fbfd78c4c1c415a00e66fa69cf7c80.tar.xz drakx-c97259e569fbfd78c4c1c415a00e66fa69cf7c80.zip | |
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".
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c09c66c05..4315795f5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakhardware: + o fix hardware support package detection (mga#27122) + Version 18.34 - 14 September 2020 - drakservices: 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)); |