brought user_input back to pause

pull/11898/head
Brian Coca 9 years ago
parent 00b1a2c865
commit f7707d8850

@ -90,6 +90,7 @@ class ActionModule(ActionBase):
start = time.time() start = time.time()
result['start'] = str(datetime.datetime.now()) result['start'] = str(datetime.datetime.now())
result['user_input'] = ''
try: try:
if seconds is not None: if seconds is not None:
@ -97,10 +98,10 @@ class ActionModule(ActionBase):
signal.signal(signal.SIGALRM, timeout_handler) signal.signal(signal.SIGALRM, timeout_handler)
signal.alarm(seconds) signal.alarm(seconds)
# show the prompt # show the prompt
print("Pausing for %d seconds" % seconds) self._display.display("Pausing for %d seconds" % seconds)
print("(ctrl+C then 'C' = continue early, ctrl+C then 'A' = abort)\r"), self._display.display("(ctrl+C then 'C' = continue early, ctrl+C then 'A' = abort)\r"),
else: else:
print(prompt) self._display.display(prompt)
# save the attributes on the existing (duped) stdin so # save the attributes on the existing (duped) stdin so
# that we can restore them later after we set raw mode # that we can restore them later after we set raw mode
@ -127,6 +128,9 @@ class ActionModule(ActionBase):
raise KeyboardInterrupt raise KeyboardInterrupt
elif key_pressed == '\r': elif key_pressed == '\r':
break break
else:
result['user_input'] += key_pressed
except KeyboardInterrupt: except KeyboardInterrupt:
# cancel the previously set alarm signal # cancel the previously set alarm signal
if seconds is not None: if seconds is not None:

Loading…
Cancel
Save