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

Merge pull request #6218 from AlanCoding/scm_inv_cancel

Browse Source 
SCM inventory cancel propagation
This commit is contained in:
Alan Rominger
2017-05-10 15:52:31 -04:00
committed by GitHub
parent f18b7f2f19 fc590535be
commit 2b15d04096
4 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/inventory.py
View File

@@ -1381,6 +1381,8 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin):
res = super(InventoryUpdate, self).cancel(job_explanation=job_explanation)
if res:
map(lambda x: x.cancel(job_explanation=self._build_job_explanation()), self.get_dependent_jobs())
if self.launch_type != 'scm' and self.source_project_update:
self.source_project_update.cancel(job_explanation=job_explanation)
return res