From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 Dec 2010 19:02:27 +0000 (+0100)
Subject: Fix if serial number of the root disk is None.
X-Git-Tag: v0.7~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e658b1a04738bfda87eac3b868b96df7de5d9666;p=oddments%2Ffireinfo.git

Fix if serial number of the root disk is None.
---

diff --git a/fireinfo/system.py b/fireinfo/system.py
index f8202e0..c0ade71 100644
--- a/fireinfo/system.py
+++ b/fireinfo/system.py
@@ -258,8 +258,12 @@ class System(object):
 
 	@property
 	def root_disk_serial(self):
-		return _fireinfo.get_harddisk_serial("/dev/%s" % self.root_disk).rstrip()
-					
+		serial = _fireinfo.get_harddisk_serial("/dev/%s" % self.root_disk)
+
+		if serial:
+			# Strip all spaces
+			return serial.strip()
+
 	def scan(self):
 		toscan = (("/sys/bus/pci/devices", device.PCIDevice),
 		("/sys/bus/usb/devices", device.USBDevice))