Merge pull request #3175 from jpmens/setup9

Protect None value in setup module (ansible 1.2)
12 years ago · 3c6d5f95f8
parent 7460c42c28 846b48655b
commit 3c6d5f95f8
1 changed files with 4 additions and 3 deletions
--- a/system/setup
+++ b/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']: