From 7fdfa01615b544e5437219e0eb2e0dd14bcbe1be Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Fri, 11 Sep 2015 21:22:09 +0200 Subject: [PATCH] composer: rename composer_install to composer_command --- packaging/language/composer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/language/composer.py b/packaging/language/composer.py index 54cb3f17ba3..6d681c5ba2e 100644 --- a/packaging/language/composer.py +++ b/packaging/language/composer.py @@ -111,11 +111,10 @@ def parse_out(string): def has_changed(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"]) composer_path = module.get_bin_path("composer", True, ["/usr/local/bin"]) cmd = "%s %s %s %s" % (php_path, composer_path, command, " ".join(options)) - return module.run_command(cmd) def main(): @@ -165,7 +164,7 @@ def main(): if module.check_mode: options.append('--dry-run') - rc, out, err = composer_install(module, command, options) + rc, out, err = composer_command(module, command, options) if rc != 0: output = parse_out(err)