diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-12-09 19:02:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-12-09 19:02:29 +0000 |
| commit | fb0b8f6d2258f1ae6c1c767a56e97857547c06a0 (patch) | |
| tree | b56e501b39ba6b01f07b84354945b9e5b8f6a8e7 /perl-install/harddrake/data.pm | |
| parent | 8516070b346f74abda18703ab8e04d3ff656e377 (diff) | |
| download | drakx-fb0b8f6d2258f1ae6c1c767a56e97857547c06a0.tar drakx-fb0b8f6d2258f1ae6c1c767a56e97857547c06a0.tar.gz drakx-fb0b8f6d2258f1ae6c1c767a56e97857547c06a0.tar.bz2 drakx-fb0b8f6d2258f1ae6c1c767a56e97857547c06a0.tar.xz drakx-fb0b8f6d2258f1ae6c1c767a56e97857547c06a0.zip | |
(pciusb_id) try harder to find duplicates: ignore description for USB
devices (especially usefull in order to track eg: input devices whose
name differs between ldetect & mouse.pm)
Diffstat (limited to 'perl-install/harddrake/data.pm')
| -rw-r--r-- | perl-install/harddrake/data.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 64befd576..fb23ebfd4 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -555,7 +555,8 @@ sub pciusb_id { pci_device => 'usb_pci_device', vendor => 'usb_vendor', ); - my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid description)); + my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid), + if_($dev->{bus} !~ /usb/i, 'description')); join(':', map { uc($dev->{$alt{$_}} || $dev->{$_}) } @fields); } |