fireinfo: Import latest patches

[people/pmueller/ipfire-2.x.git] / src / patches / fireinfo / 0001-bogomips-Don-t-crash-when-no-bogomips-are-available.patch

From a9401d9542fae575d9ce2bb534cd4e598e9c7b8e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 28 Oct 2014 21:14:41 +0100
Subject: [PATCH 1/3] bogomips: Don't crash when no bogomips are available

The RPi doesn't provide bogomips in /proc/cpuinfo any more
and fireinfo crashed when trying to read that file
---
 src/fireinfo/cpu.py    | 14 +++++++++-----
 src/fireinfo/system.py |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/fireinfo/cpu.py b/src/fireinfo/cpu.py
index 32d885db8124..541575af6bbb 100644
--- a/src/fireinfo/cpu.py
+++ b/src/fireinfo/cpu.py
@@ -80,12 +80,16 @@ class CPU(object):
 		"""
 			Return the bogomips of this CPU.
 		"""
-		try:
-			bogomips = self.__cpuinfo["bogomips"]
-		except KeyError:
-			bogomips = self.__cpuinfo["BogoMIPS"]
+		bogomips = None
+
+		for key in ("bogomips", "BogoMIPS"):
+			try:
+				bogomips = self.__cpuinfo[key]
+			except KeyError:
+				continue
 
-		return float(bogomips)
+		if bogomips:
+			return float(bogomips)
 
 	@property
 	def model(self):
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 8e903e8e3449..890f58c05027 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -144,12 +144,14 @@ class System(object):
 			"model_string" : self.cpu.model_string,
 			"stepping" : self.cpu.stepping,
 			"flags" : self.cpu.flags,
-			"bogomips" : self.cpu.bogomips,
 			"speed" : self.cpu.speed,
 			"family" : self.cpu.family,
 			"count" : self.cpu.count				
 		}
 
+		if self.cpu.bogomips:
+			p["bogomips"] = self.cpu.bogomips
+
 		p["network"] = {
 			"green" : self.network.has_green(),
 			"blue" : self.network.has_blue(),
-- 
1.9.3