From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 Dec 2010 23:43:05 +0000 (+0100)
Subject: Fixes on last commit.
X-Git-Tag: v0.7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ef2eb7767a5426c639f07484d8ced996daf7a0;p=oddments%2Ffireinfo.git

Fixes on last commit.
---

diff --git a/fireinfo/system.py b/fireinfo/system.py
index 427386b..b3ae922 100644
--- 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: