From f7707d8850c016b4ddfe1baf2416f500686ec696 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 6 Aug 2015 17:48:53 -0400 Subject: [PATCH] brought user_input back to pause --- lib/ansible/plugins/action/pause.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ansible/plugins/action/pause.py b/lib/ansible/plugins/action/pause.py index f57cee3811..c96e802f08 100644 --- a/lib/ansible/plugins/action/pause.py +++ b/lib/ansible/plugins/action/pause.py @@ -90,6 +90,7 @@ class ActionModule(ActionBase): start = time.time() result['start'] = str(datetime.datetime.now()) + result['user_input'] = '' try: if seconds is not None: @@ -97,10 +98,10 @@ class ActionModule(ActionBase): signal.signal(signal.SIGALRM, timeout_handler) signal.alarm(seconds) # show the prompt - print("Pausing for %d seconds" % seconds) - print("(ctrl+C then 'C' = continue early, ctrl+C then 'A' = abort)\r"), + self._display.display("Pausing for %d seconds" % seconds) + self._display.display("(ctrl+C then 'C' = continue early, ctrl+C then 'A' = abort)\r"), else: - print(prompt) + self._display.display(prompt) # save the attributes on the existing (duped) stdin so # that we can restore them later after we set raw mode @@ -127,6 +128,9 @@ class ActionModule(ActionBase): raise KeyboardInterrupt elif key_pressed == '\r': break + else: + result['user_input'] += key_pressed + except KeyboardInterrupt: # cancel the previously set alarm signal if seconds is not None: