Merge pull request #539 from ryanpetrello/fix-7740

fix a unicode handling bug in inventory source name migration
This commit is contained in:
Ryan Petrello 2017-10-20 13:35:20 -04:00 committed by GitHub
commit aab27e9b93

View File

@ -1,6 +1,7 @@
import logging
from django.db.models import Q
import six
logger = logging.getLogger('awx.main.migrations')
@ -38,8 +39,10 @@ def rename_inventory_sources(apps, schema_editor):
Q(deprecated_group__inventory__organization=org)).distinct().all()):
inventory = invsrc.deprecated_group.inventory if invsrc.deprecated_group else invsrc.inventory
name = '{0} - {1} - {2}'.format(invsrc.name, inventory.name, i)
logger.debug("Renaming InventorySource({0}) {1} -> {2}".format(invsrc.pk, invsrc.name, name))
name = six.text_type('{0} - {1} - {2}').format(invsrc.name, inventory.name, i)
logger.debug(six.text_type("Renaming InventorySource({0}) {1} -> {2}").format(
invsrc.pk, invsrc.name, name
))
invsrc.name = name
invsrc.save()