diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:54:02 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:54:02 +0000 |
| commit | ac197dc094b09b38b9af0b6d089b2457d98a768b (patch) | |
| tree | f1507917ab445488407a526938ad2960298e7f22 /perl-install | |
| parent | c7e9666e7d6808792801ac1ebdcc0cae452dd148 (diff) | |
| download | drakx-ac197dc094b09b38b9af0b6d089b2457d98a768b.tar drakx-ac197dc094b09b38b9af0b6d089b2457d98a768b.tar.gz drakx-ac197dc094b09b38b9af0b6d089b2457d98a768b.tar.bz2 drakx-ac197dc094b09b38b9af0b6d089b2457d98a768b.tar.xz drakx-ac197dc094b09b38b9af0b6d089b2457d98a768b.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) [backported from trunk]
Diffstat (limited to 'perl-install')
| -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); } |