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

Merge pull request #1794 from anoek/migration-fixes

Browse Source 
Fixed JobTemplate migration when inventory is NULL
This commit is contained in:
Akita Noek 2016-05-03 16:25:49 -04:00
commit 4c0f4363be
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/migrations/_rbac.py
View File

@ -142,7 +142,12 @@ def _discover_credentials(instances, cred, orgfunc):
'''
orgs = defaultdict(list)
for inst in instances:
orgs[orgfunc(inst)].append(inst)
try:
orgs[orgfunc(inst)].append(inst)
except AttributeError:
# JobTemplate.inventory can be NULL sometimes, eg when an inventory
# has been deleted. This protects against that.
pass
if len(orgs) == 1:
_update_credential_parents(orgfunc(instances[0]), cred)