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

Resolve KeyError by coercing instance_id to a str

Browse Source 
Related #3300
This commit is contained in:
James Laska
2016-08-19 15:33:18 -04:00
parent 188f81ef3d
commit 08c4c9647b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/management/commands/inventory_import.py
View File

@@ -22,6 +22,7 @@ import yaml
from django.conf import settings from django.conf import settings
from django.core.management.base import NoArgsCommand, CommandError from django.core.management.base import NoArgsCommand, CommandError
from django.db import connection, transaction from django.db import connection, transaction
from django.utils.encoding import smart_text
# AWX # AWX
from awx.main.models import * # noqa from awx.main.models import * # noqa
@@ -606,7 +607,7 @@ class Command(NoArgsCommand):
break break
instance_id = from_dict.get(key, default) instance_id = from_dict.get(key, default)
from_dict = instance_id from_dict = instance_id
return instance_id return smart_text(instance_id)
def _get_enabled(self, from_dict, default=None): def _get_enabled(self, from_dict, default=None):
''' '''