Merge branch 't-apt-list' of git://github.com/Elemecca/ansible into devel

reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit 72696fec03

@ -363,7 +363,7 @@ def main():
update_cache = dict(default=False, aliases=['update-cache'], type='bool'), update_cache = dict(default=False, aliases=['update-cache'], type='bool'),
cache_valid_time = dict(type='int'), cache_valid_time = dict(type='int'),
purge = dict(default=False, type='bool'), purge = dict(default=False, type='bool'),
package = dict(default=None, aliases=['pkg', 'name']), package = dict(default=None, aliases=['pkg', 'name'], type='list'),
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'),
@ -444,7 +444,7 @@ def main():
if p['upgrade']: if p['upgrade']:
upgrade(module, p['upgrade'], force_yes, dpkg_options) upgrade(module, p['upgrade'], force_yes, dpkg_options)
packages = p['package'].split(',') packages = p['package']
latest = p['state'] == 'latest' latest = p['state'] == 'latest'
for package in packages: for package in packages:
if package.count('=') > 1: if package.count('=') > 1:

Loading…
Cancel
Save