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

Merge pull request #12530 from amenonsen/fixups

Browse source 
Update outdated comment
This commit is contained in:
Brian Coca 2015-09-26 08:16:14 -04:00
commit a591582b24
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/inventory/ini.py
View file

@ -352,8 +352,7 @@ class InventoryParser(object):
# FIXME: What are the real restrictions on group names, or rather, what # FIXME: What are the real restrictions on group names, or rather, what
# should they be? At the moment, they must be non-empty sequences of non # should they be? At the moment, they must be non-empty sequences of non
# whitespace characters excluding ':' and ']', but we should define more # whitespace characters excluding ':' and ']', but we should define more
# precise rules in order to support better diagnostics. The same applies # precise rules in order to support better diagnostics.
# to hostnames. It seems sensible for them both to follow DNS rules.
self.patterns['groupname'] = re.compile( self.patterns['groupname'] = re.compile(
r'''^ r'''^

12
lib/ansible/playbook/play_context.py
View file

@ -356,11 +356,13 @@ class PlayContext(Base):
'' ''
if self.become_method == 'sudo': if self.become_method == 'sudo':
# Rather than detect if sudo wants a password this time, -k makes sudo always ask for # If we have a password, we run sudo with a randomly-generated
# a password if one is required. Passing a quoted compound command to sudo (or sudo -s) # prompt set using -p. Otherwise we run it with -n, which makes
# directly doesn't work, so we shellquote it with pipes.quote() and pass the quoted # it fail if it would have prompted for a password.
# string to the user's shell. We loop reading output until we see the randomly-generated #
# sudo prompt set with the -p option. # Passing a quoted compound command to sudo (or sudo -s)
# directly doesn't work, so we shellquote it with pipes.quote()
# and pass the quoted string to the user's shell.
# force quick error if password is required but not supplied, should prevent sudo hangs. # force quick error if password is required but not supplied, should prevent sudo hangs.
if self.become_pass: if self.become_pass: