mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 21:32:49 +00:00
support i18n on sudo failure
This commit is contained in:
committed by
Michael DeHaan
parent
0905683c1f
commit
89bc43cab0
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user