wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

composer: rename composer_install to composer_command

Browse source
This commit is contained in:
Rene Moser 2015-09-11 21:22:09 +02:00 committed by Matt Clay
parent 61fcbe0d51
commit b9960c0172
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/extras/packaging/language/composer.py
View file

@ -111,11 +111,10 @@ def parse_out(string):
def has_changed(string): def has_changed(string):
return "Nothing to install or update" not in string return "Nothing to install or update" not in string
def composer_install(module, command, options): def composer_command(module, command, options=[]):
php_path = module.get_bin_path("php", True, ["/usr/local/bin"]) php_path = module.get_bin_path("php", True, ["/usr/local/bin"])
composer_path = module.get_bin_path("composer", True, ["/usr/local/bin"]) composer_path = module.get_bin_path("composer", True, ["/usr/local/bin"])
cmd = "%s %s %s %s" % (php_path, composer_path, command, " ".join(options)) cmd = "%s %s %s %s" % (php_path, composer_path, command, " ".join(options))
return module.run_command(cmd) return module.run_command(cmd)
def main(): def main():
@ -165,7 +164,7 @@ def main():
if module.check_mode: if module.check_mode:
options.append('--dry-run') options.append('--dry-run')
rc, out, err = composer_install(module, command, options) rc, out, err = composer_command(module, command, options)
if rc != 0: if rc != 0:
output = parse_out(err) output = parse_out(err)