Fixes on last commit.

diff --git a/fireinfo/system.py b/fireinfo/system.py
index 427386b980cead92a46a530d58391bc41a833a6a..b3ae92241f479d3595247fce91d4d3c7c1594747 100644 (file)
--- a/fireinfo/system.py
+++ b/fireinfo/system.py
@@ -186,7 +186,7 @@ class System(object):
                # which is globally unique.
                for file in ("product_uuid", "product_serial", "chassis_serial"):
                        id = read_from_file(os.path.join(SYS_CLASS_DMI, file))
-                       ids.append(self.__validate_string(id))
+                       ids.append(id)
 
                # Use serial number from root disk (if available)
                root_disk_serial = self.root_disk_serial
@@ -202,8 +202,8 @@ class System(object):
                _ids = []
                for id in ids:
                        for i in INVALID_ID_STRINGS:
-                               if i in s:
-                                       s = None
+                               if i in id:
+                                       id = None
                                        break
 
                        if id: