From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Feb 2015 22:24:44 +0000 (+0100)
Subject: Abort when vendor/model was found
X-Git-Tag: v2.1.11~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3383941db43440d5ac3a5692c4f890e255ec613f;p=oddments%2Ffireinfo.git

Abort when vendor/model was found

When a vendor/model was read for the DMI information,
the method did not abort and tried searching at other
sources.

Fixes #10745
---

diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index ce33837..daf77b3 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -334,13 +334,12 @@ class System(object):
 		for file in ("sys_vendor", "board_vendor", "chassis_vendor",):
 			ret = read_from_file(os.path.join(SYS_CLASS_DMI, file))
 			if ret:
-				break
+				return ret
 
-		if ret is None:
-			if os.path.exists("/proc/device-tree"):
-				ret = self.__cpuinfo.get("Hardware", None)
-			else:
-				ret, m = self.vendor_model_tuple()
+		if os.path.exists("/proc/device-tree"):
+			ret = self.__cpuinfo.get("Hardware", None)
+		else:
+			ret, m = self.vendor_model_tuple()
 
 		return ret
 
@@ -353,7 +352,7 @@ class System(object):
 		for file in ("product_name", "board_model", "chassis_model",):
 			ret = read_from_file(os.path.join(SYS_CLASS_DMI, file))
 			if ret:
-				break
+				return ret
 
 		# Read device-tree model if available
 		ret = read_from_file("/proc/device-tree/model")