Fix bug in preprocessing when wrapped line is appended to a non-exist…

…ing entry.
ansible-collections · Jun 2, 2023 · bba5bac · bba5bac
1 parent 2b8c66b
commit bba5bac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelogs/fragments/177-facts-parsing.yml b/changelogs/fragments/177-facts-parsing.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "facts - do not crash in CLI output preprocessing in unexpected situations during line unwrapping (https://github.com/ansible-collections/community.routeros/issues/170, https://github.com/ansible-collections/community.routeros/pull/177)."
diff --git a/plugins/modules/facts.py b/plugins/modules/facts.py
@@ -391,7 +391,7 @@ def preprocess(self, data):
         for line in data.split('\n'):
             if len(line) == 0 or line[:5] == 'Flags':
                 continue
-            elif not re.match(self.WRAPPED_LINE_RE, line):
+            elif not preprocessed or not re.match(self.WRAPPED_LINE_RE, line):
                 preprocessed.append(line)
             else:
                 preprocessed[-1] += line
@@ -468,7 +468,7 @@ def preprocess(self, data):
         for line in data.split('\n'):
             if len(line) == 0 or line[:5] == 'Flags':
                 continue
-            elif not re.match(self.WRAPPED_LINE_RE, line):
+            elif not preprocessed or not re.match(self.WRAPPED_LINE_RE, line):
                 preprocessed.append(line)
             else:
                 preprocessed[-1] += line
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- "facts - do not crash in CLI output preprocessing in unexpected situations during line unwrapping (https://github.com/ansible-collections/community.routeros/issues/170, https://github.com/ansible-collections/community.routeros/pull/177)."