External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4667 from AlanCoding/update_fix

Browse Source 
fix project sync revision bug

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-09-05 20:29:10 +00:00
committed by GitHub
parent b4759de30d c65b77a20a
commit 927c99a2f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -1888,8 +1888,8 @@ class RunProjectUpdate(BaseTask):
extra_vars.update(extra_vars_new) extra_vars.update(extra_vars_new)
scm_branch = project_update.scm_branch scm_branch = project_update.scm_branch
branch_override = bool(project_update.scm_branch != project_update.project.scm_branch) branch_override = bool(scm_branch and project_update.scm_branch != project_update.project.scm_branch)
if project_update.job_type == 'run' and scm_branch and (not branch_override): if project_update.job_type == 'run' and (not branch_override):
scm_branch = project_update.project.scm_revision scm_branch = project_update.project.scm_revision
elif not scm_branch: elif not scm_branch:
scm_branch = {'hg': 'tip'}.get(project_update.scm_type, 'HEAD') scm_branch = {'hg': 'tip'}.get(project_update.scm_type, 'HEAD')