From 2e12a5f8c2e40ea3a65f86c6b2c692826e65d4cb Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi <a.badger@gmail.com> Date: Sat, 28 Oct 2017 01:35:32 -0700 Subject: [PATCH] Revert "Removed a force conditional (#28851)" (#32282) This reverts commit 07acc579db839170122fc66505a886ef023d5f4f. On closer examination of this code, the conditional that had force in it was not a parent of this one. So handling of force is needed i both branches. See the recent comments on #23391 --- lib/ansible/cli/galaxy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index 74c179be00..6cec4eb222 100644 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -385,8 +385,9 @@ class GalaxyCLI(CLI): (role.name, role.install_info['version'], role.version or "unspecified")) continue else: - display.display('- %s is already installed, skipping.' % str(role)) - continue + if not force: + display.display('- %s is already installed, skipping.' % str(role)) + continue try: installed = role.install()