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

Make apt upgrade=dist work and make its argument handling more idiomatic

Browse source 
Fixes #2287.
This commit is contained in:
Daniel Hokka Zakrisson 2013-03-05 23:46:34 +01:00
parent 67e16eebbb
commit 3d49f74df6
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_common.py
View file

@ -527,7 +527,7 @@ class AnsibleModule(object):
for check in spec: for check in spec:
count = self._count_terms(check) count = self._count_terms(check)
if count == 0: if count == 0:
self.fail_json(msg="one of the following is required: %s" % check) self.fail_json(msg="one of the following is required: %s" % ','.join(check))
def _check_required_together(self, spec): def _check_required_together(self, spec):
if spec is None: if spec is None:

23
library/apt
View file

@ -73,7 +73,7 @@ options:
version_added: "1.1" version_added: "1.1"
required: false required: false
default: no default: no
choices: [ "yes", "no", "dist"] choices: [ "yes", "dist"]
author: Matthew Williams author: Matthew Williams
notes: [] notes: []
examples: examples:
@ -186,13 +186,13 @@ def remove(m, pkgspec, cache, purge=False):
m.exit_json(changed=True) m.exit_json(changed=True)
def upgrade(m, mode="yes"): def upgrade(m, mode="yes"):
upgrade_command = '-o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade' upgrade_command = 'upgrade'
if mode == "dist": if mode == "dist":
upgrade_command = '-o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" dist-upgrade' upgrade_command = 'dist-upgrade'
cmd = "%s -q -y %s" % (APT, upgrade_command) cmd = '%s -q -y -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" %s' % (APT, upgrade_command)
rc, out, err = m.run_command(cmd) rc, out, err = m.run_command(cmd)
if rc: if rc:
m.fail_json(msg="'apt-get %s ' failed: %s" % (upgrade_command, err)) m.fail_json(msg="'apt-get %s' failed: %s" % (upgrade_command, err))
if "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." in out : if "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." in out :
m.exit_json(changed=False) m.exit_json(changed=False)
m.exit_json(changed=True) m.exit_json(changed=True)
@ -201,14 +201,16 @@ def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
state = dict(default='installed', choices=['installed', 'latest', 'removed', 'absent', 'present']), state = dict(default='installed', choices=['installed', 'latest', 'removed', 'absent', 'present']),
update_cache = dict(default='no', aliases=['update-cache'], type='bool'), update_cache = dict(aliases=['update-cache'], type='bool'),
purge = dict(default='no', type='bool'), purge = dict(default='no', type='bool'),
package = dict(default=None, aliases=['pkg', 'name']), package = dict(default=None, aliases=['pkg', 'name']),
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='yes', aliases=['install-recommends'], type='bool'),
force = dict(default='no', type='bool'), force = dict(default='no', type='bool'),
upgrade = dict(default="no", type='bool') upgrade = dict(choices=['yes', 'dist'])
), ),
mutually_exclusive = [['package', 'upgrade']],
required_one_of = [['package', 'upgrade', 'update_cache']],
supports_check_mode = True supports_check_mode = True
) )
@ -222,9 +224,6 @@ def main():
module.fail_json(msg="Cannot find apt-get") module.fail_json(msg="Cannot find apt-get")
p = module.params p = module.params
if p['package'] is None and not p['update_cache'] and not p['upgrade']:
module.fail_json(msg='pkg=name and/or update_cache=yes or upgrade=yes is required')
install_recommends = p['install_recommends'] install_recommends = p['install_recommends']
cache = apt.Cache() cache = apt.Cache()
@ -241,10 +240,8 @@ def main():
force_yes = p['force'] force_yes = p['force']
if p['upgrade'] and p['package'] is None: if p['upgrade']:
upgrade(module, p['upgrade']) upgrade(module, p['upgrade'])
elif p['upgrade'] and p['package'] != None:
module.fail_json(msg="Upgrade should not be used in conjunction with other options.")
packages = p['package'].split(',') packages = p['package'].split(',')
latest = p['state'] == 'latest' latest = p['state'] == 'latest'