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

Resolve rebase conflicts

Browse source
This commit is contained in:
Paul Durivage 2014-01-06 10:23:23 -06:00
parent ab6ee1a282
commit d21281ff43
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/__init__.py
View file

@ -325,7 +325,7 @@ class PlayBook(object):
private_key_file=self.private_key_file, private_key_file=self.private_key_file,
setup_cache=self.SETUP_CACHE, setup_cache=self.SETUP_CACHE,
basedir=task.play.basedir, basedir=task.play.basedir,
conditional=task.only_if, conditional=task.when,
callbacks=self.runner_callbacks, callbacks=self.runner_callbacks,
sudo=task.sudo, sudo=task.sudo,
sudo_user=task.sudo_user, sudo_user=task.sudo_user,

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

@ -229,7 +229,7 @@ class Connection(object):
if p.stderr in rfd: if p.stderr in rfd:
chunk = p.stderr.read() chunk = p.stderr.read()
if not chunk: if not chunk:
raise errors.AnsibleError('ssh connection closed waiting for sudo password prompt') raise errors.AnsibleError('ssh connection closed waiting for sudo or su password prompt')
sudo_errput += chunk sudo_errput += chunk
incorrect_password = gettext.dgettext( incorrect_password = gettext.dgettext(
"sudo", "Sorry, try again.") "sudo", "Sorry, try again.")