]> git.ipfire.org Git - ipfire.org.git/commitdiff
i-use: Fix shortened CPU string for intel's core2quad.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Jan 2011 13:23:06 +0000 (14:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Jan 2011 13:23:06 +0000 (14:23 +0100)
www/webapp/backend/stasy.py

index 0eab55785df6c62b9f25ac609ebaef7b5c055c6d..a9a947d8a28c7e3b0731990cf6851c22e87e9cac 100644 (file)
@@ -28,9 +28,9 @@ CPU_STRINGS = (
        # Intel
        (r"Intel.*(Atom|Celeron).*CPU\s*([A-Z0-9]+) .*", r"Intel \1 \2"),
        (r"(Intel).*(Celeron).*", r"\1 \2"),
-       (r"Intel.* Core.*2 Duo CPU .* ([A-Z0-9]+) .*", r"Intel C2D \1"),
+       (r"Intel.* Core.*2 Duo *CPU .* ([A-Z0-9]+) .*", r"Intel C2D \1"),
        (r"Intel.* Core.*2 CPU .* ([A-Z0-9]+) .*", r"Intel C2 \1"),
-       (r"Intel.* Core.*2 Quad CPU .* ([A-Z0-9]+) .*", r"Intel C2Q \1"),
+       (r"Intel.* Core.*2 Quad *CPU .* ([A-Z0-9]+) .*", r"Intel C2Q \1"),
        (r"Intel.* Xeon.* CPU .* ([A-Z0-9]+) .*", r"Intel Xeon \1"),
        (r"(Intel).*(Xeon).*", r"\1 \2"),
        (r"Intel.* Pentium.* (D|4) .*", r"Intel Pentium \1"),