Protect None value in setup module

This commit is contained in:
Jan-Piet Mens 2013-06-11 07:08:55 +02:00
parent 1fd863cf5d
commit 3f301fd439

View file

@ -619,9 +619,10 @@ class LinuxHardware(Hardware):
d['rotational'] = get_file_content(sysdir + "/queue/rotational") d['rotational'] = get_file_content(sysdir + "/queue/rotational")
d['scheduler_mode'] = "" d['scheduler_mode'] = ""
scheduler = get_file_content(sysdir + "/queue/scheduler") scheduler = get_file_content(sysdir + "/queue/scheduler")
m = re.match(".*?(\[(.*)\])", scheduler) if scheduler is not None:
if m: m = re.match(".*?(\[(.*)\])", scheduler)
d['scheduler_mode'] = m.group(2) if m:
d['scheduler_mode'] = m.group(2)
d['sectors'] = get_file_content(sysdir + "/size") d['sectors'] = get_file_content(sysdir + "/size")
if not d['sectors']: if not d['sectors']: