]> git.ipfire.org Git - oddments/fireinfo.git/commitdiff
Fix if serial number of the root disk is None.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Dec 2010 19:02:27 +0000 (20:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Dec 2010 19:02:27 +0000 (20:02 +0100)
fireinfo/system.py

index f8202e068600378071dc77d9eb47a504de8ce957..c0ade716a7e11f72430c43cd1fb8d64ebe17554b 100644 (file)
@@ -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))