From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Mar 2015 15:15:30 +0000 (+0100)
Subject: fireinfo: Fix regex for AMD APUs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c85ebbc4215f503784ec787789f4e9fbad668078;p=ipfire.org.git

fireinfo: Fix regex for AMD APUs
---

diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py
index 0773c525..4aab91e7 100644
--- a/webapp/backend/fireinfo.py
+++ b/webapp/backend/fireinfo.py
@@ -33,7 +33,7 @@ CPU_VENDORS = {
 CPU_STRINGS = (
 	### AMD ###
 	# APU
-	(r"AMD (\w+) APU with Radeon(tm) HD Graphics", r"AMD \1 APU"),
+	(r"AMD ([\w\-]+) APU with Radeon\(tm\) HD Graphics", r"AMD \1 APU"),
 	# Athlon
 	(r"AMD Athlon.* II X2 ([a-z0-9]+).*", r"AMD Athlon X2 \1"),
 	(r"AMD Athlon\(tm\) 64 Processor (\w+)", r"AMD Athlon64 \1"),