Fix ios enable password regex in terminal plugin (#35741)

Fixes #33993

On some ios devices the enable password prompt does not
end with a space, add a fix to handle this scenario.
This commit is contained in:
Ganesh Nalawade
2018-02-06 12:10:32 +05:30
committed by GitHub
parent 575e9e9294
commit df5fc7af67

View File

@@ -64,7 +64,7 @@ class TerminalModule(TerminalBase):
if passwd:
# Note: python-3.5 cannot combine u"" and r"" together. Thus make
# an r string and use to_text to ensure it's text on both py2 and py3.
cmd[u'prompt'] = to_text(r"[\r\n]password: $", errors='surrogate_or_strict')
cmd[u'prompt'] = to_text(r"[\r\n]password: ?$", errors='surrogate_or_strict')
cmd[u'answer'] = passwd
cmd[u'prompt_retry_check'] = True
try: