Only use disk string if no other was found.

diff --git a/fireinfo/system.py b/fireinfo/system.py
index 21a7496e992be4a4f9350b5ff55f4f9ac9e56362..72a4fbce82be4b98e6bb7e878b7ed21ecd59e5aa 100644 (file)
--- a/fireinfo/system.py
+++ b/fireinfo/system.py
@@ -190,11 +190,6 @@ class System(object):
                        id = read_from_file(os.path.join(SYS_CLASS_DMI, file))
                        ids.append(id)
 
-               # Use serial number from root disk (if available)
-               root_disk_serial = self.root_disk_serial
-               if root_disk_serial:
-                       ids.append(root_disk_serial)
-
                # Sort out all bogous or invalid strings from the list.
                _ids = []
                for id in ids:
@@ -211,6 +206,11 @@ class System(object):
 
                ids = _ids
 
+               # Use serial number from root disk (if available)
+               root_disk_serial = self.root_disk_serial
+               if root_disk_serial:
+                       ids.append(root_disk_serial)
+
                # As last resort, we use the UUID from pakfire.
                if not ids:
                        id = read_from_file("/opt/pakfire/db/uuid")