[systemd-commits] 4 commits - hwdb/70-mouse.hwdb src/test

[Zbigniew Jędrzejewski-Szmek]

 hwdb/70-mouse.hwdb       |   10 ++++++----
 src/test/test-cap-list.c |    6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit f08fa3be8d0b90ff0e778c7f2457711e9800ae95
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Dec 18 18:42:04 2014 -0500

    hwdb: move Logitech mouse to the right spot

diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 2c75015..11e61c0 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -94,10 +94,6 @@ mouse:usb:v046dpc063:name:DELL DELL USB Laser Mouse:
 ##########################################
 
 # Lenovo Optical USB Mouse
-mouse:usb:v046dpc016:name:Logitech Optical USB Mouse:
- MOUSE_DPI=600 at 125
-
-# Lenovo Optical USB Mouse
 mouse:usb:v17efp6019:name:Lenovo Optical USB Mouse:
  MOUSE_DPI=1000 at 125
 
@@ -124,6 +120,8 @@ mouse:usb:v046dpc03e:name:Logitech USB-PS/2 Optical Mouse:
 
 # Logitech USB-PS/2 M-BZ96C
 mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
+# Logitech Optical USB Mouse
+mouse:usb:v046dpc016:name:Logitech Optical USB Mouse:
  MOUSE_DPI=600 at 125
 
 # Logitech Wirless Mouse M325

commit 90d37f7e8f9e9ab91b5d78bedfbca54b92143745
Author: Erik Auerswald <auerswal at unix-ag.uni-kl.de>
Date:   Thu Dec 18 18:46:29 2014 -0500

    hwdb: Logitech, Inc. RX 250 Optical Mouse DPI data
    
    https://bugs.freedesktop.org/show_bug.cgi?id=87435

diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 373b148..2c75015 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -136,6 +136,8 @@ mouse:usb:v046dpc50e:name:Logitech USB RECEIVER:
 mouse:usb:v046dpc50e:name:Logitech USB Receiver:
 # Logitech, Inc. RX 300 Optical Mouse
 mouse:usb:v046dpc040:name:Logitech USB-PS/2 Optical Mouse:
+# Logitech, Inc. RX 250 Optical Mouse
+mouse:usb:v046dpc050:name:Logitech USB-PS/2 Optical Mouse:
  MOUSE_DPI=800 at 125
 
 # Logitech MX 518

commit 171347760e6864d3c92bcd220013a62049fd4636
Author: Tim JP <t.jp at gmx.de>
Date:   Thu Dec 18 18:40:44 2014 -0500

    hwdb: Logitech, Inc. RX 300 Optical Mouse DPI data
    
    https://bugs.freedesktop.org/show_bug.cgi?id=87456

diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index e16cf53..373b148 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -134,6 +134,8 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
 mouse:usb:v046dpc50e:name:Logitech USB RECEIVER:
 # Logitech Cordless Click! Plus
 mouse:usb:v046dpc50e:name:Logitech USB Receiver:
+# Logitech, Inc. RX 300 Optical Mouse
+mouse:usb:v046dpc040:name:Logitech USB-PS/2 Optical Mouse:
  MOUSE_DPI=800 at 125
 
 # Logitech MX 518

commit dbf1f77bf727f7566f25553232b33843ecc172f0
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Dec 18 17:40:32 2014 -0500

    test-cap-list: allow mismatch in case

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 238f876..7c5ae18 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -52,8 +52,8 @@ int main(int argc, char *argv[]) {
 
                 assert_se(a = cap_to_name(i));
 
-                /* quite the loop as soon as libcap only returns
-                 * numeric ids, formatted as string */
+                /* quit the loop as soon as libcap starts returning
+                 * numeric ids, formatted as strings */
                 if (safe_atou(a, &u) >= 0)
                         break;
 
@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
 
                 printf("%s vs. %s\n", a, b);
 
-                assert_se(streq(a, b));
+                assert_se(strcasecmp(a, b) == 0);
         }
 
         return 0;