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 ce33837af7477a2c755fcf81a42527af9a2dd244..daf77b399d2044322139d64dd9c0a83da8aa219a 100644 (file)
--- 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")