shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

do not propogate cancel of inventory sync back up to project

Browse Source
This commit is contained in:
AlanCoding 2017-11-13 08:15:24 -05:00
parent bc705ad8ce
commit 33574d70c8
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks.py
View File

@ -1543,11 +1543,11 @@ class RunProjectUpdate(BaseTask):
except InventoryUpdate.DoesNotExist: except InventoryUpdate.DoesNotExist:
logger.warning('%s Dependent inventory update deleted during execution.', project_update.log_format) logger.warning('%s Dependent inventory update deleted during execution.', project_update.log_format)
continue continue
if project_update.cancel_flag or local_inv_update.cancel_flag: if project_update.cancel_flag:
if not project_update.cancel_flag: logger.info('Project update {} was canceled while updating dependent inventories.'.format(project_update.log_format))
self.update_model(project_update.pk, cancel_flag=True, job_explanation=_( break
'Dependent inventory update {} was canceled.'.format(local_inv_update.name))) if local_inv_update.cancel_flag:
break # Stop rest of updates if project or inventory update was canceled logger.info('Continuing to process project dependencies after {} was canceled'.format(local_inv_update.log_format))
if local_inv_update.status == 'successful': if local_inv_update.status == 'successful':
inv_src.scm_last_revision = scm_revision inv_src.scm_last_revision = scm_revision
inv_src.save(update_fields=['scm_last_revision']) inv_src.save(update_fields=['scm_last_revision'])