diff options
| author | James Cammarata <jimi@sngx.net> | 2016-12-07 21:33:38 -0500 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2016-12-08 11:25:36 -0500 |
| commit | 8afa090417bcb6b7007ab6feb1ce3281cdd37001 (patch) | |
| tree | 47ac2b7cef9572b90cddb866222e4a969dbebda9 /lib/ansible/modules/packaging/os | |
| parent | 95d59b61ebaeaeec53a3860c590bb95a38f96e45 (diff) | |
| download | ansible-8afa090417bcb6b7007ab6feb1ce3281cdd37001.tar.gz | |
Resolving differences in core modules post-merge
Diffstat (limited to 'lib/ansible/modules/packaging/os')
| -rw-r--r-- | lib/ansible/modules/packaging/os/rhn_register.py | 4 | ||||
| -rw-r--r-- | lib/ansible/modules/packaging/os/rpm_key.py | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/packaging/os/yum.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/modules/packaging/os/rhn_register.py b/lib/ansible/modules/packaging/os/rhn_register.py index e5fc77147d..c228f0b1b7 100644 --- a/lib/ansible/modules/packaging/os/rhn_register.py +++ b/lib/ansible/modules/packaging/os/rhn_register.py @@ -71,13 +71,13 @@ options: - supply a custom ssl CA certificate file for use with registration required: False default: None - version_added: "2.0" + version_added: "2.1" systemorgid: description: - supply an organizational id for use with registration required: False default: None - version_added: "2.0" + version_added: "2.1" channels: description: - Optionally specify a list of comma-separated channels to subscribe to upon successful registration. diff --git a/lib/ansible/modules/packaging/os/rpm_key.py b/lib/ansible/modules/packaging/os/rpm_key.py index 83d5e967f8..9cb058c56a 100644 --- a/lib/ansible/modules/packaging/os/rpm_key.py +++ b/lib/ansible/modules/packaging/os/rpm_key.py @@ -154,7 +154,7 @@ class RpmKey: gpg = self.module.get_bin_path('gpg2') if not gpg: - self.json_fail(msg="rpm_key requires a command lne gpg or gpg2, none found") + self.json_fail(msg="rpm_key requires a command line gpg or gpg2, none found") stdout, stderr = self.execute_command([gpg, '--no-tty', '--batch', '--with-colons', '--fixed-list-mode', '--list-packets', keyfile]) for line in stdout.splitlines(): diff --git a/lib/ansible/modules/packaging/os/yum.py b/lib/ansible/modules/packaging/os/yum.py index 53f4c24804..18e7171390 100644 --- a/lib/ansible/modules/packaging/os/yum.py +++ b/lib/ansible/modules/packaging/os/yum.py @@ -56,7 +56,7 @@ options: aliases: [ 'pkg' ] exclude: description: - - "Package name(s) to exlude when state=present, or latest + - "Package name(s) to exclude when state=present, or latest" required: false version_added: "2.0" default: null |