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

Not all license errors are caught, do not assume they are

Browse Source
This commit is contained in:
Alan Rominger
2020-11-14 22:23:42 -05:00
parent 197d50bc44
commit ec93af4ba8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -2797,6 +2797,7 @@ class RunInventoryUpdate(BaseTask):
from awx.main.management.commands.inventory_import import Command as InventoryImportCommand from awx.main.management.commands.inventory_import import Command as InventoryImportCommand
cmd = InventoryImportCommand() cmd = InventoryImportCommand()
exc = None
try: try:
# note that we are only using the management command to # note that we are only using the management command to
# save the inventory data to the database. # save the inventory data to the database.
@@ -2806,6 +2807,8 @@ class RunInventoryUpdate(BaseTask):
# for us. # for us.
save_status, tb, exc = cmd.perform_update(options, data, inventory_update) save_status, tb, exc = cmd.perform_update(options, data, inventory_update)
except Exception as raw_exc: except Exception as raw_exc:
if exc is None:
exc = raw_exc
# Ignore license errors specifically # Ignore license errors specifically
if 'Host limit for organization' not in str(exc) and 'License' not in str(exc): if 'Host limit for organization' not in str(exc) and 'License' not in str(exc):
raise raw_exc raise raw_exc