External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9044 from kdelee/awx_silent_delete_conflict

Browse Source 
silent_delete also needs to handle Confict

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-01-08 16:25:54 +00:00
committed by GitHub
parent 1dec79b62d a157a3598f
commit aa87a99441
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awxkit/awxkit/api/pages/base.py
View File

@@ -25,9 +25,11 @@ class Base(Page):
return self.delete() return self.delete()
except (exc.NoContent, exc.NotFound, exc.Forbidden): except (exc.NoContent, exc.NotFound, exc.Forbidden):
pass pass
except exc.BadRequest as e: except (exc.BadRequest, exc.Conflict) as e:
if 'Job has not finished processing events' in e.msg: if 'Job has not finished processing events' in e.msg:
pass pass
if 'Resource is being used' in e.msg:
pass
else: else:
raise e raise e