Commit 89bc43ca by Michael Vogt Committed by Michael DeHaan

support i18n on sudo failure

parent 0905683c
......@@ -25,6 +25,7 @@ import select
import fcntl
import hmac
import pwd
import gettext
from hashlib import sha1
import ansible.constants as C
from ansible.callbacks import vvv
......@@ -191,9 +192,11 @@ class Connection(object):
rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout, p.stderr], 1)
# fail early if the sudo password is wrong
if (self.runner.sudo and sudoable and self.runner.sudo_pass and
stdout.endswith("Sorry, try again.\r\n%s" % prompt)):
raise errors.AnsibleError('Incorrect sudo password')
if self.runner.sudo and sudoable and self.runner.sudo_pass:
incorrect_password = gettext.dgettext(
"sudo", "Sorry, try again.")
if stdout.endswith("%s\r\n%s" % (incorrect_password, prompt)):
raise errors.AnsibleError('Incorrect sudo password')
if p.stdout in rfd:
dat = os.read(p.stdout.fileno(), 9000)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment