Make second group match of ufw status output optional (#56678)

* Make second group match of ufw status output optional Fixes #56674 * Fix comparison logic. * Add changelog fragment (cherry picked from commit 1d22909)
ansible · May 28, 2019 · 0128006 · 0128006
1 parent 7d9aa0d
commit 0128006
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelogs/fragments/56678-ufw-status-change-detection.yaml b/changelogs/fragments/56678-ufw-status-change-detection.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - ufw - correctly check status when logging is off (https://github.com/ansible/ansible/issues/56674)
diff --git a/lib/ansible/modules/system/ufw.py b/lib/ansible/modules/system/ufw.py
@@ -445,12 +445,14 @@ def ufw_version():
                 execute(cmd + [['-f'], [states[value]]])
 
         elif command == 'logging':
-            extract = re.search(r'Logging: (on|off) \(([a-z]+)\)', pre_state)
+            extract = re.search(r'Logging: (on|off)(?: \(([a-z]+)\))?', pre_state)
             if extract:
                 current_level = extract.group(2)
                 current_on_off_value = extract.group(1)
                 if value != "off":
-                    if value != "on" and (value != current_level or current_on_off_value == "off"):
+                    if current_on_off_value == "off":
+                        changed = True
+                    elif value != "on" and value != current_level:
                         changed = True
                 elif current_on_off_value != "off":
                     changed = True