diff options
| author | Pavel Zuna <pzuna@redhat.com> | 2010-02-17 18:32:58 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-02-17 12:47:36 -0500 |
| commit | 93a09b2dd120d54d9221f0391e8e8395a7cf7a80 (patch) | |
| tree | d18b0c10ba1b5e137eeb21837684d17e4ae3c7ce /ipalib/plugins/migration.py | |
| parent | eb1577686b36d17963343dafc7ca31dc4ec8c150 (diff) | |
| download | freeipa-93a09b2dd120d54d9221f0391e8e8395a7cf7a80.tar.gz freeipa-93a09b2dd120d54d9221f0391e8e8395a7cf7a80.tar.xz freeipa-93a09b2dd120d54d9221f0391e8e8395a7cf7a80.zip | |
Make error message in migration plugin unicode.
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index fee1b3490..b509675fe 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) |