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

Merge pull request #539 from ryanpetrello/fix-7740

Browse Source 
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
parent 88acd95a72 b60a30cbd4
commit aab27e9b93
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
import logging import logging
from django.db.models import Q from django.db.models import Q
import six
logger = logging.getLogger('awx.main.migrations') 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()): Q(deprecated_group__inventory__organization=org)).distinct().all()):
inventory = invsrc.deprecated_group.inventory if invsrc.deprecated_group else invsrc.inventory inventory = invsrc.deprecated_group.inventory if invsrc.deprecated_group else invsrc.inventory
name = '{0} - {1} - {2}'.format(invsrc.name, inventory.name, i) name = six.text_type('{0} - {1} - {2}').format(invsrc.name, inventory.name, i)
logger.debug("Renaming InventorySource({0}) {1} -> {2}".format(invsrc.pk, invsrc.name, name)) logger.debug(six.text_type("Renaming InventorySource({0}) {1} -> {2}").format(
invsrc.pk, invsrc.name, name
))
invsrc.name = name invsrc.name = name
invsrc.save() invsrc.save()