From a48c4422759605a95e74d0a7e8456ad35f72caa8 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 10 Oct 2022 19:11:20 +0530 Subject: [PATCH] Misc Typo fixes (#79088) --- lib/ansible/config/base.yml | 4 ++-- lib/ansible/executor/task_executor.py | 6 +++--- lib/ansible/galaxy/dependency_resolution/dataclasses.py | 2 +- lib/ansible/module_utils/common/locale.py | 2 +- lib/ansible/modules/apt_key.py | 4 ++-- lib/ansible/modules/include_vars.py | 2 +- lib/ansible/modules/set_fact.py | 2 +- lib/ansible/modules/set_stats.py | 2 +- lib/ansible/plugins/loader.py | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index c7fef870068..3033d303ef4 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -902,7 +902,7 @@ DEFAULT_NO_TARGET_SYSLOG: default: False description: - Toggle Ansible logging to syslog on the target when it executes tasks. On Windows hosts this will disable a newer - style PowerShell modules from writting to the event log. + style PowerShell modules from writing to the event log. env: [{name: ANSIBLE_NO_TARGET_SYSLOG}] ini: - {key: no_target_syslog, section: defaults} @@ -1456,7 +1456,7 @@ GALAXY_IGNORE_INVALID_SIGNATURE_STATUS_CODES: - section: galaxy key: ignore_signature_status_codes description: - - A list of GPG status codes to ignore during GPG signature verfication. + - A list of GPG status codes to ignore during GPG signature verification. See L(https://github.com/gpg/gnupg/blob/master/doc/DETAILS#general-status-codes) for status code descriptions. - If fewer signatures successfully verify the collection than `GALAXY_REQUIRED_VALID_SIGNATURE_COUNT`, signature verification will fail even if all error codes are ignored. diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 6718f31085d..1f35031f8c1 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -556,7 +556,7 @@ class TaskExecutor: plugin_vars = self._set_connection_options(cvars, templar) # make a copy of the job vars here, as we update them here and later, - # but don't want to polute original + # but don't want to pollute original vars_copy = variables.copy() # update with connection info (i.e ansible_host/ansible_user) self._connection.update_vars(vars_copy) @@ -578,7 +578,7 @@ class TaskExecutor: setattr(self._connection, '_socket_path', socket_path) # TODO: eventually remove this block as this should be a 'consequence' of 'forced_local' modules - # special handling for python interpreter for network_os, default to ansible python unless overriden + # special handling for python interpreter for network_os, default to ansible python unless overridden if 'ansible_network_os' in cvars and 'ansible_python_interpreter' not in cvars: # this also avoids 'python discovery' cvars['ansible_python_interpreter'] = sys.executable @@ -802,7 +802,7 @@ class TaskExecutor: # add the delegated vars to the result, so we can reference them # on the results side without having to do any further templating - # also now add conneciton vars results when delegating + # also now add connection vars results when delegating if self._task.delegate_to: result["_ansible_delegated_vars"] = {'ansible_delegated_host': self._task.delegate_to} for k in plugin_vars: diff --git a/lib/ansible/galaxy/dependency_resolution/dataclasses.py b/lib/ansible/galaxy/dependency_resolution/dataclasses.py index 60015dbfe76..16fd6318f86 100644 --- a/lib/ansible/galaxy/dependency_resolution/dataclasses.py +++ b/lib/ansible/galaxy/dependency_resolution/dataclasses.py @@ -193,7 +193,7 @@ class _ComputedReqKindsMixin: falls back to guessing the FQCN based on the directory path and sets the version to "*". - It raises a ValueError immediatelly if the input is not an + It raises a ValueError immediately if the input is not an existing directory path. """ if not os.path.isdir(dir_path): diff --git a/lib/ansible/module_utils/common/locale.py b/lib/ansible/module_utils/common/locale.py index e8b201b23ea..a6068c8666a 100644 --- a/lib/ansible/module_utils/common/locale.py +++ b/lib/ansible/module_utils/common/locale.py @@ -56,6 +56,6 @@ def get_best_parsable_locale(module, preferences=None, raise_on_locale=False): else: module.debug('Failed to get locale information: %s' % to_native(e)) - module.debug('Matched prefered locale to: %s' % found) + module.debug('Matched preferred locale to: %s' % found) return found diff --git a/lib/ansible/modules/apt_key.py b/lib/ansible/modules/apt_key.py index f4a4126dcbd..18b8834469d 100644 --- a/lib/ansible/modules/apt_key.py +++ b/lib/ansible/modules/apt_key.py @@ -28,7 +28,7 @@ attributes: platforms: debian notes: - The apt-key command has been deprecated and suggests to 'manage keyring files in trusted.gpg.d instead'. See the Debian wiki for details. - This module is kept for backwards compatiblity for systems that still use apt-key as the main way to manage apt repository keys. + This module is kept for backwards compatibility for systems that still use apt-key as the main way to manage apt repository keys. - As a sanity check, downloaded key id must match the one specified. - "Use full fingerprint (40 characters) key ids to avoid key collisions. To generate a full-fingerprint imported key: C(apt-key adv --list-public-keys --with-fingerprint --with-colons)." @@ -160,7 +160,7 @@ key_id: type: str sample: "36A1D7869245C8950F966E92D8576A8BA88D21E9" short_id: - description: caclulated short key id + description: calculated short key id returned: always type: str sample: "A88D21E9" diff --git a/lib/ansible/modules/include_vars.py b/lib/ansible/modules/include_vars.py index d341df0050e..f0aad94ad44 100644 --- a/lib/ansible/modules/include_vars.py +++ b/lib/ansible/modules/include_vars.py @@ -90,7 +90,7 @@ extends_documentation_fragment: - action_core attributes: action: - details: While the action plugin does do some of the work it relies on the core engine to actually create the variables, that part cannot be overriden + details: While the action plugin does do some of the work it relies on the core engine to actually create the variables, that part cannot be overridden support: partial bypass_host_loop: support: none diff --git a/lib/ansible/modules/set_fact.py b/lib/ansible/modules/set_fact.py index 74ea5cdf051..5609e5bc189 100644 --- a/lib/ansible/modules/set_fact.py +++ b/lib/ansible/modules/set_fact.py @@ -33,7 +33,7 @@ options: (by 7 steps) of the variable created. U(https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) - "This actually creates 2 copies of the variable, a normal 'set_fact' host variable with high precedence and - a lower 'ansible_fact' one that is available for persistance via the facts cache plugin. + a lower 'ansible_fact' one that is available for persistence via the facts cache plugin. This creates a possibly confusing interaction with C(meta: clear_facts) as it will remove the 'ansible_fact' but not the host variable." type: bool default: no diff --git a/lib/ansible/modules/set_stats.py b/lib/ansible/modules/set_stats.py index 3fa0975cddc..2fd21da143d 100644 --- a/lib/ansible/modules/set_stats.py +++ b/lib/ansible/modules/set_stats.py @@ -38,7 +38,7 @@ extends_documentation_fragment: - action_core attributes: action: - details: While the action plugin does do some of the work it relies on the core engine to actually create the variables, that part cannot be overriden + details: While the action plugin does do some of the work it relies on the core engine to actually create the variables, that part cannot be overridden support: partial bypass_host_loop: support: none diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index dbaa6677307..d09138b12f3 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -1280,10 +1280,10 @@ class Jinja2Loader(PluginLoader): raise AnsibleError('Do not set both path_only and class_only when calling PluginLoader.all()') found = set() - # get plugins from files in configured paths (mulitple in each) + # get plugins from files in configured paths (multiple in each) for p_map in self._j2_all_file_maps(*args, **kwargs): - # p_map is really object from file with class that holds mulitple plugins + # p_map is really object from file with class that holds multiple plugins plugins_list = getattr(p_map, self.method_map_name) try: plugins = plugins_list()