From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Oct 2011 23:54:33 +0000 (+0200)
Subject: Fix cpu model detection regression on x86.
X-Git-Tag: v2.1.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=656522f4c134131b7826129525048c52dc4c17ce;p=oddments%2Ffireinfo.git

Fix cpu model detection regression on x86.
---

diff --git a/fireinfo/cpu.py b/fireinfo/cpu.py
index ed63177..9199df9 100644
--- a/fireinfo/cpu.py
+++ b/fireinfo/cpu.py
@@ -105,7 +105,10 @@ class CPU(object):
 		"""
 			Return the model string of this CPU.
 		"""
-		return self.__cpuinfo["Processor"]
+		try:
+			return self.__cpuinfo["model_name"]
+		except KeyError:
+			return self.__cpuinfo["Processor"]
 
 	@property
 	def vendor(self):
@@ -191,8 +194,6 @@ if __name__ == "__main__":
 	print "Flags:", c.flags
 	print "Bogomips:", c.bogomips
 	print "Speed:", c.speed
-	print "Hypervisor:", c.hypervisor
-	print "Virtype:", c.virtype
 	print "Family:", c.family
 	print "Count:", c.count
 	print "Model string:", c.model_string