Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc typo fixes #53284

Merged
merged 1 commit into from
Mar 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/ansible/plugins/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ def set_options(self, task_keys=None, var_options=None, direct=None):
self._options = C.config.get_plugin_options(get_plugin_class(self), self._load_name, keys=task_keys, variables=var_options, direct=direct)

# allow extras/wildcards from vars that are not directly consumed in configuration
# this is needed to support things like winrm that can have extended protocol options we don't direclty handle
# this is needed to support things like winrm that can have extended protocol options we don't directly handle
if self.allow_extras and var_options and '_extras' in var_options:
self.set_option('_extras', var_options['_extras'])

def _check_required(self):
# FIXME: standarize required check based on config
# FIXME: standardize required check based on config
pass
4 changes: 2 additions & 2 deletions lib/ansible/plugins/become/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


def _gen_id(length=32):
''' return random string used to identify the current privelege escalation '''
''' return random string used to identify the current privilege escalation '''
return ''.join(choice(ascii_lowercase) for x in range(length))


Expand Down Expand Up @@ -65,7 +65,7 @@ def check_success(self, b_output):
return any(b_success in l.rstrip() for l in b_output.splitlines(True))

def check_password_prompt(self, b_output):
''' checks if the expected passwod prompt exists in b_output '''
''' checks if the expected password prompt exists in b_output '''
if self.prompt:
b_prompt = to_bytes(self.prompt).strip()
return any(l.strip().startswith(b_prompt) for l in b_output.splitlines())
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/become/doas.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class BecomeModule(BecomeBase):
missing = ('Authorization required',)

def check_password_prompt(self, b_output):
''' checks if the expected passwod prompt exists in b_output '''
''' checks if the expected password prompt exists in b_output '''

# FIXME: more accurate would be: 'doas (%s@' % remote_user
# however become plugins don't have that information currently
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/become/ksu.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class BecomeModule(BecomeBase):
missing = ('No password given',)

def check_password_prompt(self, b_output):
''' checks if the expected passwod prompt exists in b_output '''
''' checks if the expected password prompt exists in b_output '''

prompts = self.get_option('prompt_l10n') or ["Kerberos password for .*@.*:"]
b_prompt = b"|".join(to_bytes(p) for p in prompts)
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/become/sesu.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

DOCUMENTATION = """
become: sesu
short_description: CA Privilged Access Manager
short_description: CA Privileged Access Manager
description:
- This become plugins allows your remote/login user to execute commands as another user via the sesu utility.
author: ansible (@nekonyuu)
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/become/su.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class BecomeModule(BecomeBase):
]

def check_password_prompt(self, b_output):
''' checks if the expected passwod prompt exists in b_output '''
''' checks if the expected password prompt exists in b_output '''

prompts = self.get_option('prompt_l10n') or self.SU_PROMPT_LOCALIZATIONS
b_password_string = b"|".join((br'(\w+\'s )?' + to_bytes(p)) for p in prompts)
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/callback/counter_enabled.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def v2_playbook_on_task_start(self, task, is_conditional):
# args can be specified as no_log in several places: in the task or in
# the argument spec. We can check whether the task is no_log but the
# argument spec can't be because that is only run on the target
# machine and we haven't run it thereyet at this time.
# machine and we haven't run it there yet at this time.
#
# So we give people a config option to affect display of the args so
# that they can secure this if they feel that their stdout is insecure
Expand Down