From b3ca7acb41d1d9215e9f5171d41d4c82e37794b0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Wed, 25 Apr 2018 13:46:46 -0400
Subject: [PATCH] Only pass --force if we have an scm_result (i.e., we ran an
 actual checkout/revision change.)

---
 awx/playbooks/project_update.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml
index 5d6682d499..d9067bac45 100644
--- a/awx/playbooks/project_update.yml
+++ b/awx/playbooks/project_update.yml
@@ -139,7 +139,7 @@
         register: doesRequirementsExist
 
       - name: fetch galaxy roles from requirements.yml
-        command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ --force
+        command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ {{ scm_result is defined|ternary('--force',omit) }}
         args:
           chdir: "{{project_path|quote}}/roles"
         when: doesRequirementsExist.stat.exists