From 93a09b2dd120d54d9221f0391e8e8395a7cf7a80 Mon Sep 17 00:00:00 2001 From: Pavel Zuna Date: Wed, 17 Feb 2010 18:32:58 +0100 Subject: Make error message in migration plugin unicode. --- ipalib/plugins/migration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipalib/plugins/migration.py') diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index fee1b349..b509675f 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -63,7 +63,7 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx): entry_attrs.setdefault('gidnumber', ctx['def_group_gid']) # generate a principal name and check if it isn't already taken - principal = '%s@%s' % (pkey, api.env.realm) + principal = u'%s@%s' % (pkey, api.env.realm) try: ldap.find_entry_by_attr( 'krbprincipalname', principal, 'krbprincipalaux', [''] @@ -308,7 +308,7 @@ class migrate_ds(Command): try: ldap.add_entry(dn, entry_attrs) except errors.ExecutionError, e: - failed[ldap_obj_name][pkey] = str(e) + failed[ldap_obj_name][pkey] = unicode(e) else: migrated[ldap_obj_name].append(pkey) -- cgit