summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-09 19:00:27 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-09 19:00:27 +0000
commit4a047aa78653c653d4cb635f3d00bf1c502c33b9 (patch)
treeee5f122eb002cf873b8b09c73f2a6257ecddb4d1
parent4ee448a20d1a593b03216c98cb2230ae973a2ff1 (diff)
downloaddrakx-4a047aa78653c653d4cb635f3d00bf1c502c33b9.tar
drakx-4a047aa78653c653d4cb635f3d00bf1c502c33b9.tar.gz
drakx-4a047aa78653c653d4cb635f3d00bf1c502c33b9.tar.bz2
drakx-4a047aa78653c653d4cb635f3d00bf1c502c33b9.tar.xz
drakx-4a047aa78653c653d4cb635f3d00bf1c502c33b9.zip
(pciusb_id) try harder to find duplicates: ignore case (b/c bus can be
either 'USB' or 'usb' (eg: input devices)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3491919df..5c6cfc406 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -13,6 +13,7 @@
o do not show duplicated hardware as unknown (#46242):
* list PC Speaker as sound card
* track duplicated input devices
+ * try harder to find duplicates
Version 11.71 - 6 November 2008
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 89d93fd27..9901b3691 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -556,7 +556,7 @@ sub pciusb_id {
vendor => 'usb_vendor',
);
my @fields = qw(bus pci_bus pci_device vendor id subvendor subid description);
- join(':', map { $dev->{$alt{$_}} || $dev->{$_} } @fields);
+ join(':', map { uc($dev->{$alt{$_}} || $dev->{$_}) } @fields);
}