cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support i18n on sudo failure

Browse source
This commit is contained in:
Michael Vogt 2013-08-08 17:02:52 +02:00 committed by Michael DeHaan
parent 0905683c1f
commit 89bc43cab0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/runner/connection_plugins/ssh.py
View file

@ -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)