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

Change install_recommended in apt to a trinary.

Browse source 
Conditions are now "yes", "no", and "default", with the latter falling
back to the OS default.
This commit is contained in:
Harlan Lieberman-Berg 2015-08-15 18:41:42 +02:00 committed by Matt Clay
parent 8ef4715cf6
commit 1ff12b66fb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/packaging/os/apt.py
View file

@ -62,7 +62,7 @@ options:
default: null default: null
install_recommends: install_recommends:
description: description:
- Corresponds to the C(--no-install-recommends) option for I(apt). Default behavior (C(yes)) replicates apt's default behavior; C(no) does not install recommended packages. Suggested packages are never installed. - Corresponds to the C(--no-install-recommends) option for I(apt). C(yes) installs recommended packages. C(no) does not install recommended packages. By default, Ansible will use the same defaults as the operating system. Suggested packages are never installed.
required: false required: false
default: yes default: yes
choices: [ "yes", "no" ] choices: [ "yes", "no" ]
@ -339,7 +339,7 @@ def expand_pkgspec_from_fnmatches(m, pkgspec, cache):
return new_pkgspec return new_pkgspec
def install(m, pkgspec, cache, upgrade=False, default_release=None, def install(m, pkgspec, cache, upgrade=False, default_release=None,
install_recommends=True, force=False, install_recommends, force=False,
dpkg_options=expand_dpkg_options(DPKG_OPTIONS), dpkg_options=expand_dpkg_options(DPKG_OPTIONS),
build_dep=False): build_dep=False):
pkg_list = [] pkg_list = []
@ -385,9 +385,9 @@ def install(m, pkgspec, cache, upgrade=False, default_release=None,
if default_release: if default_release:
cmd += " -t '%s'" % (default_release,) cmd += " -t '%s'" % (default_release,)
if not install_recommends: if install_recommends == 'no':
cmd += " -o APT::Install-Recommends=no" cmd += " -o APT::Install-Recommends=no"
else: elif install_recommends == 'yes':
cmd += " -o APT::Install-Recommends=yes" cmd += " -o APT::Install-Recommends=yes"
rc, out, err = m.run_command(cmd) rc, out, err = m.run_command(cmd)
@ -549,7 +549,7 @@ def main():
package = dict(default=None, aliases=['pkg', 'name'], type='list'), package = dict(default=None, aliases=['pkg', 'name'], type='list'),
deb = dict(default=None), deb = dict(default=None),
default_release = dict(default=None, aliases=['default-release']), default_release = dict(default=None, aliases=['default-release']),
install_recommends = dict(default='yes', aliases=['install-recommends'], type='bool'), install_recommends = dict(default='default', aliases=['install-recommends'], choices=['default', 'yes', 'no'),
force = dict(default='no', type='bool'), force = dict(default='no', type='bool'),
upgrade = dict(choices=['no', 'yes', 'safe', 'full', 'dist']), upgrade = dict(choices=['no', 'yes', 'safe', 'full', 'dist']),
dpkg_options = dict(default=DPKG_OPTIONS) dpkg_options = dict(default=DPKG_OPTIONS)