Protect None value in setup module

3f301fd4 · Jan-Piet Mens · 1fd863cf · 3f301fd4
Commit 3f301fd4 authored Jun 11, 2013 by Jan-Piet Mens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

library/system/setup
+4 -3

No files found.
--- a/library/system/setup
+++ b/library/system/setup
@@ -619,9 +619,10 @@ class LinuxHardware(Hardware):
            d['rotational'] = get_file_content(sysdir + "/queue/rotational")
            d['scheduler_mode'] = ""
            scheduler = get_file_content(sysdir + "/queue/scheduler")
-            m = re.match(".*?(\[(.*)\])", scheduler)
-            if m:
-                d['scheduler_mode'] = m.group(2)
+            if scheduler is not None:
+                m = re.match(".*?(\[(.*)\])", scheduler)
+                if m:
+                    d['scheduler_mode'] = m.group(2)

            d['sectors'] = get_file_content(sysdir + "/size")
            if not d['sectors']: