summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-06 15:53:17 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-06 15:53:17 +0000
commit1a7e35a1d94129af448d91fb9d2daca714492a0f (patch)
tree2d2bdcce5fdb8dba7cabce128b15c242024b3520
parent519b8796aa1827d8534c838e8842025418bb2a9d (diff)
downloaddrakx-backup-do-not-use-1a7e35a1d94129af448d91fb9d2daca714492a0f.tar
drakx-backup-do-not-use-1a7e35a1d94129af448d91fb9d2daca714492a0f.tar.gz
drakx-backup-do-not-use-1a7e35a1d94129af448d91fb9d2daca714492a0f.tar.bz2
drakx-backup-do-not-use-1a7e35a1d94129af448d91fb9d2daca714492a0f.tar.xz
drakx-backup-do-not-use-1a7e35a1d94129af448d91fb9d2daca714492a0f.zip
(pciusb_id) try harder to find duplicates: ignore case (b/c bus can be
either 'USB' or 'usb' (eg: input devices) [backported from trunk]
-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 bbd89f03c..d51a67047 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -8,6 +8,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.2 - 5 December 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);
}