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

Cpanm module could not use less than Python 2.6

Browse source 
Removed str.format() dependency to allow cpanm module to work on nodes with versions of Python less than 2.6.
This commit is contained in:
Andrew Miller 2016-05-26 16:21:12 +09:00 committed by Matt Clay
parent 2b50114d58
commit 7ac4909357
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/extras/packaging/language/cpanm.py
View file

@ -135,27 +135,27 @@ def _build_cmd_line(name, from_path, notest, locallib, mirror, mirror_only, inst
# 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:
cmd = "{cpanm} {path}".format(cpanm=cpanm, path=from_path) cmd = cpanm + " " + from_path
else: else:
cmd = "{cpanm} {name}".format(cpanm=cpanm, name=name) cmd = cpanm + " " + name
if notest is True: if notest is True:
cmd = "{cmd} -n".format(cmd=cmd) cmd = cmd + " -n"
if locallib is not None: if locallib is not None:
cmd = "{cmd} -l {locallib}".format(cmd=cmd, locallib=locallib) cmd = cmd + " -l " + locallib
if mirror is not None: if mirror is not None:
cmd = "{cmd} --mirror {mirror}".format(cmd=cmd, mirror=mirror) cmd = cmd + " --mirror " + mirror
if mirror_only is True: if mirror_only is True:
cmd = "{cmd} --mirror-only".format(cmd=cmd) cmd = cmd + " --mirror-only"
if installdeps is True: if installdeps is True:
cmd = "{cmd} --installdeps".format(cmd=cmd) cmd = cmd + " --installdeps"
if use_sudo is True: if use_sudo is True:
cmd = "{cmd} --sudo".format(cmd=cmd) cmd = cmd + " --sudo"
return cmd return cmd