cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3175 from jpmens/setup9

Browse source 
Protect None value in setup module (ansible 1.2)
This commit is contained in:
Michael DeHaan 2013-06-13 04:22:15 -07:00
commit 39aa5e5eac
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/system/setup
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']: