Merge pull request #12530 from amenonsen/fixups

Update outdated comment

lib/ansible/inventory/ini.py

@@ -352,8 +352,7 @@ class InventoryParser(object):
         # 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
         # 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(
             r'''^

lib/ansible/playbook/play_context.py

@@ -356,11 +356,13 @@ class PlayContext(Base):
                     ''
 
             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.
                 if self.become_pass: