Merge pull request #68 from marcusramberg/add_mirror_only

Add support for mirror_only parameter to cpanm module
This commit is contained in:
Brian Coca 2015-02-12 15:17:41 -05:00
commit a16b9f5286

View file

@ -53,6 +53,11 @@ options:
- Specifies the base URL for the CPAN mirror to use - Specifies the base URL for the CPAN mirror to use
required: false required: false
default: false default: false
mirror_only:
description:
- Use the mirror's index file instead of the CPAN Meta DB
required: false
default: false
examples: examples:
- code: "cpanm: name=Dancer" - code: "cpanm: name=Dancer"
description: Install I(Dancer) perl package. description: Install I(Dancer) perl package.
@ -82,7 +87,7 @@ def _is_package_installed(module, name, locallib, cpanm):
else: else:
return False return False
def _build_cmd_line(name, from_path, notest, locallib, mirror, cpanm): def _build_cmd_line(name, from_path, notest, locallib, mirror, mirror_only, cpanm):
# this code should use "%s" like everything else and just return early but not fixing all of it now. # this code should use "%s" like everything else and just return early but not fixing all of it now.
# don't copy stuff like this # don't copy stuff like this
if from_path: if from_path:
@ -99,6 +104,9 @@ def _build_cmd_line(name, from_path, notest, locallib, mirror, cpanm):
if mirror is not None: if mirror is not None:
cmd = "{cmd} --mirror {mirror}".format(cmd=cmd, mirror=mirror) cmd = "{cmd} --mirror {mirror}".format(cmd=cmd, mirror=mirror)
if mirror_only is True:
cmd = "{cmd} --mirror-only".format(cmd=cmd)
return cmd return cmd
@ -109,6 +117,7 @@ def main():
notest=dict(default=False, type='bool'), notest=dict(default=False, type='bool'),
locallib=dict(default=None, required=False), locallib=dict(default=None, required=False),
mirror=dict(default=None, required=False) mirror=dict(default=None, required=False)
mirror_only=dict(default=False, type='bool'),
) )
module = AnsibleModule( module = AnsibleModule(
@ -122,6 +131,7 @@ def main():
notest = module.boolean(module.params.get('notest', False)) notest = module.boolean(module.params.get('notest', False))
locallib = module.params['locallib'] locallib = module.params['locallib']
mirror = module.params['mirror'] mirror = module.params['mirror']
mirror_only = module.params['mirror_only']
changed = False changed = False
@ -129,7 +139,7 @@ def main():
if not installed: if not installed:
out_cpanm = err_cpanm = '' out_cpanm = err_cpanm = ''
cmd = _build_cmd_line(name, from_path, notest, locallib, mirror, cpanm) cmd = _build_cmd_line(name, from_path, notest, locallib, mirror, mirror_only, cpanm)
rc_cpanm, out_cpanm, err_cpanm = module.run_command(cmd, check_rc=False) rc_cpanm, out_cpanm, err_cpanm = module.run_command(cmd, check_rc=False)