diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:53:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:53:30 +0000 |
| commit | c7e9666e7d6808792801ac1ebdcc0cae452dd148 (patch) | |
| tree | 32eced7cef7f60dbfde9ae2b121415ad56b2d04e | |
| parent | 1a7e35a1d94129af448d91fb9d2daca714492a0f (diff) | |
| download | drakx-c7e9666e7d6808792801ac1ebdcc0cae452dd148.tar drakx-c7e9666e7d6808792801ac1ebdcc0cae452dd148.tar.gz drakx-c7e9666e7d6808792801ac1ebdcc0cae452dd148.tar.bz2 drakx-c7e9666e7d6808792801ac1ebdcc0cae452dd148.tar.xz drakx-c7e9666e7d6808792801ac1ebdcc0cae452dd148.zip | |
(pciusb_id) try harder to find duplicates: ignore pci bus & function
for USB devices (especially usefull in order to track eg: input
devices) [backported from trunk]
| -rw-r--r-- | perl-install/harddrake/data.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 9901b3691..64befd576 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -555,7 +555,7 @@ sub pciusb_id { pci_device => 'usb_pci_device', vendor => 'usb_vendor', ); - my @fields = qw(bus pci_bus pci_device vendor id subvendor subid description); + my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid description)); join(':', map { uc($dev->{$alt{$_}} || $dev->{$_}) } @fields); } |