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

Merge pull request #140 from chrismeyersfsu/fix-license

Browse Source 
detect invalid license thrown by inventory update
This commit is contained in:
Chris Meyers
2015-04-14 11:25:02 -04:00
parent caf49979f8 64d4304a97
commit c5d3089083
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1217,7 +1217,8 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
update_fields = kwargs.get('update_fields', []) update_fields = kwargs.get('update_fields', [])
if bool(('license' in self.result_stdout or 'licensed' in self.result_stdout) and if bool(('license' in self.result_stdout or 'licensed' in self.result_stdout) and
'exceeded' in self.result_stdout and not self.license_error): 'exceeded' in self.result_stdout and not self.license_error) or \
bool('License has expired' in self.result_stdout or 'License count exceeded'):
self.license_error = True self.license_error = True
if 'license_error' not in update_fields: if 'license_error' not in update_fields:
update_fields.append('license_error') update_fields.append('license_error')