Merge pull request #2115 from kavink/devel
teach apt module to support --check mode
This commit is contained in:
commit
ae599d8a61
2 changed files with 13 additions and 5 deletions
11
library/apt
11
library/apt
|
@ -141,6 +141,9 @@ def install(m, pkgspec, cache, upgrade=False, default_release=None, install_reco
|
|||
if not install_recommends:
|
||||
cmd += " --no-install-recommends"
|
||||
|
||||
if m.check_mode:
|
||||
m.exit_json(changed=True)
|
||||
|
||||
rc, out, err = m.run_command(cmd)
|
||||
if rc:
|
||||
m.fail_json(msg="'apt-get install %s' failed: %s" % (packages, err))
|
||||
|
@ -164,6 +167,10 @@ def remove(m, pkgspec, cache, purge=False):
|
|||
if purge:
|
||||
purge = '--purge'
|
||||
cmd = "%s -q -y %s remove %s" % (APT, purge,packages)
|
||||
|
||||
if m.check_mode:
|
||||
m.exit_json(changed=True)
|
||||
|
||||
rc, out, err = m.run_command(cmd)
|
||||
if rc:
|
||||
m.fail_json(msg="'apt-get remove %s' failed: %s" % (packages, err))
|
||||
|
@ -180,7 +187,8 @@ def main():
|
|||
default_release = dict(default=None, aliases=['default-release']),
|
||||
install_recommends = dict(default='yes', aliases=['install-recommends'], choices=['yes', 'no']),
|
||||
force = dict(default='no', choices=['yes', 'no'])
|
||||
)
|
||||
),
|
||||
supports_check_mode = True
|
||||
)
|
||||
|
||||
try:
|
||||
|
@ -235,4 +243,3 @@ def main():
|
|||
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
|
||||
|
||||
main()
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ def present(module, dest, regexp, line, insertafter, insertbefore, create, backu
|
|||
msg = 'line added'
|
||||
changed = True
|
||||
|
||||
if changed:
|
||||
if changed and not module.check_mode:
|
||||
if backup and os.path.exists(dest):
|
||||
module.backup_local(dest)
|
||||
f = open(dest, 'wb')
|
||||
|
@ -189,7 +189,7 @@ def absent(module, dest, regexp, backup):
|
|||
|
||||
lines = filter(matcher, lines)
|
||||
changed = len(found) > 0
|
||||
if changed:
|
||||
if changed and not module.check_mode:
|
||||
if backup:
|
||||
module.backup_local(dest)
|
||||
f = open(dest, 'wb')
|
||||
|
@ -209,7 +209,8 @@ def main():
|
|||
create=dict(default=False, choices=BOOLEANS),
|
||||
backup=dict(default=False, choices=BOOLEANS),
|
||||
),
|
||||
mutually_exclusive = [['insertbefore', 'insertafter']]
|
||||
mutually_exclusive = [['insertbefore', 'insertafter']],
|
||||
supports_check_mode = True
|
||||
)
|
||||
|
||||
params = module.params
|
||||
|
|
Loading…
Reference in a new issue