Revert "Removed a force conditional (#28851)" (#32282)

This reverts commit 07acc579db.

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
(cherry picked from commit 2e12a5f8c2)
This commit is contained in:
Toshio Kuratomi 2017-10-28 01:35:32 -07:00
parent b6c117ebdd
commit fdcb419c8d

View file

@ -385,8 +385,9 @@ class GalaxyCLI(CLI):
(role.name, role.install_info['version'], role.version or "unspecified")) (role.name, role.install_info['version'], role.version or "unspecified"))
continue continue
else: else:
display.display('- %s is already installed, skipping.' % str(role)) if not force:
continue display.display('- %s is already installed, skipping.' % str(role))
continue
try: try:
installed = role.install() installed = role.install()