From 1a7e35a1d94129af448d91fb9d2daca714492a0f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 6 Jan 2009 15:53:17 +0000
Subject: (pciusb_id) try harder to find duplicates: ignore case (b/c bus can
 be either 'USB' or 'usb' (eg: input devices) [backported from trunk]

---
 perl-install/NEWS              | 1 +
 perl-install/harddrake/data.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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);
 }
 
 
-- 
cgit v1.2.1