From 45be7288eae27170fa0170e1591b2ef81132ad58 Mon Sep 17 00:00:00 2001 From: Tomas Herfert Date: Thu, 17 Nov 2022 17:50:52 +0100 Subject: [PATCH 1/4] terminal regex udpate to match the terminal prompt in safe mode Signed-off-by: Tomas Herfert --- plugins/terminal/routeros.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/terminal/routeros.py b/plugins/terminal/routeros.py index a2646e36..1d3fa6c4 100644 --- a/plugins/terminal/routeros.py +++ b/plugins/terminal/routeros.py @@ -33,7 +33,7 @@ class TerminalModule(TerminalBase): terminal_stdout_re = [ re.compile(br"\x1b<"), - re.compile(br"\[[\w\-\.]+\@[\w\s\-\.\/]+\] ?> ?$"), + re.compile(br"\[[\w\-\.]+\@[\w\s\-\.\/]+\] ?( ?$"), re.compile(br"Please press \"Enter\" to continue!"), re.compile(br"Do you want to see the software license\? \[Y\/n\]: ?"), ] From b6ff3f77d2795be7eb990092162dc16b59a1d28e Mon Sep 17 00:00:00 2001 From: Tomas Herfert Date: Thu, 17 Nov 2022 18:00:47 +0100 Subject: [PATCH 2/4] changelog Signed-off-by: Tomas Herfert --- changelogs/fragments/134-command-safemode.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/134-command-safemode.yml diff --git a/changelogs/fragments/134-command-safemode.yml b/changelogs/fragments/134-command-safemode.yml new file mode 100644 index 00000000..a6494b6e --- /dev/null +++ b/changelogs/fragments/134-command-safemode.yml @@ -0,0 +1,3 @@ +bugfixes: + - ``command`` module - commands don't timeout in safe mode anymore + (https://github.com/ansible-collections/community.routeros/pull/134). From 74256489369c10bd738da3af28d330004e263994 Mon Sep 17 00:00:00 2001 From: Tomas Herfert Date: Thu, 17 Nov 2022 18:06:39 +0100 Subject: [PATCH 3/4] yamllint fix Signed-off-by: Tomas Herfert --- changelogs/fragments/134-command-safemode.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelogs/fragments/134-command-safemode.yml b/changelogs/fragments/134-command-safemode.yml index a6494b6e..95a7e23a 100644 --- a/changelogs/fragments/134-command-safemode.yml +++ b/changelogs/fragments/134-command-safemode.yml @@ -1,3 +1,3 @@ bugfixes: - - ``command`` module - commands don't timeout in safe mode anymore - (https://github.com/ansible-collections/community.routeros/pull/134). + - "``command`` module - commands don't timeout in safe mode anymore + (https://github.com/ansible-collections/community.routeros/pull/134)." From 00537e8fec385d362e2dc0a04d8b8afbe404a2e2 Mon Sep 17 00:00:00 2001 From: Tomas Herfert <68421396+therfert@users.noreply.github.com> Date: Thu, 17 Nov 2022 20:22:29 +0100 Subject: [PATCH 4/4] Update changelogs/fragments/134-command-safemode.yml Co-authored-by: Felix Fontein --- changelogs/fragments/134-command-safemode.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/134-command-safemode.yml b/changelogs/fragments/134-command-safemode.yml index 95a7e23a..4482d924 100644 --- a/changelogs/fragments/134-command-safemode.yml +++ b/changelogs/fragments/134-command-safemode.yml @@ -1,3 +1,3 @@ bugfixes: - - "``command`` module - commands don't timeout in safe mode anymore + - "command, facts - commands do not timeout in safe mode anymore (https://github.com/ansible-collections/community.routeros/pull/134)."