zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12544 from jbradberry/awxkit-fix-no-content

Browse Source 
Suppress 204 No Content results causing an error during import
This commit is contained in:
Jeff Bradberry
2022-07-20 10:48:02 -04:00
committed by GitHub
parent 71925de902 fe1a767f4f
commit 1bcfc8f28e
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/api.py
View File

@@ -283,9 +283,11 @@ class ApiV2(base.Base):
_page = _page.put(post_data) _page = _page.put(post_data)
changed = True changed = True
except exc.NoContent: # desired exception under some circumstances, e.g. labels that already exist
pass
except (exc.Common, AssertionError) as e: except (exc.Common, AssertionError) as e:
identifier = asset.get("name", None) or asset.get("username", None) or asset.get("hostname", None) identifier = asset.get("name", None) or asset.get("username", None) or asset.get("hostname", None)
log.error(f"{endpoint} \"{identifier}\": {e}.") log.error(f'{endpoint} "{identifier}": {e}.')
self._has_error = True self._has_error = True
log.debug("post_data: %r", post_data) log.debug("post_data: %r", post_data)
continue continue