IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

migrate-ds: print out failed attempts when no users/groups are migrated

Browse Source 
This patch should fix both https://fedorahosted.org/freeipa/ticket/4846 and
https://fedorahosted.org/freeipa/ticket/4952.

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Martin Babinsky 2015-03-17 14:39:54 +01:00 committed by Petr Vobornik
parent fa50068607
commit 5a5e1a2494
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ipalib/plugins/migration.py
View File

@ -268,7 +268,7 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwargs
def _post_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx): def _post_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx):
assert isinstance(dn, DN) assert isinstance(dn, DN)
_update_default_group(ldap, pkey, config, ctx, False) _update_default_group(ldap, ctx, False)
if 'description' in entry_attrs and NO_UPG_MAGIC in entry_attrs['description']: if 'description' in entry_attrs and NO_UPG_MAGIC in entry_attrs['description']:
entry_attrs['description'].remove(NO_UPG_MAGIC) entry_attrs['description'].remove(NO_UPG_MAGIC)
@ -279,7 +279,7 @@ def _post_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx):
except (errors.EmptyModlist, errors.NotFound): except (errors.EmptyModlist, errors.NotFound):
pass pass
def _update_default_group(ldap, pkey, config, ctx, force): def _update_default_group(ldap, ctx, force):
migrate_cnt = ctx['migrate_cnt'] migrate_cnt = ctx['migrate_cnt']
group_dn = ctx['def_group_dn'] group_dn = ctx['def_group_dn']
@ -841,13 +841,7 @@ can use their Kerberos accounts.''')
api.log.info("%d %ss migrated. %s elapsed." % (migrate_cnt, ldap_obj_name, total_dur)) api.log.info("%d %ss migrated. %s elapsed." % (migrate_cnt, ldap_obj_name, total_dur))
api.log.debug("%d %ss migrated, duration: %s (total %s)" % (migrate_cnt, ldap_obj_name, d, total_dur)) api.log.debug("%d %ss migrated, duration: %s (total %s)" % (migrate_cnt, ldap_obj_name, d, total_dur))
# if no users/groups were found (all lists in 'migrated' are empty), _update_default_group(ldap, context, True)
# we raise an error that there is nothing to migrate
if not any(migrated.values()):
raise errors.NotFound(
reason=_("Found no users/groups to migrate "
"from '%(ds_ldap)s'.") % dict(ds_ldap=ds_ldap))
_update_default_group(ldap, pkey, config, context, True)
return (migrated, failed) return (migrated, failed)
@ -920,6 +914,7 @@ can use their Kerberos accounts.''')
if not result['compat']: if not result['compat']:
textui.print_plain("The compat plug-in is enabled. This can increase the memory requirements during migration. Disable the compat plug-in with \'ipa-compat-manage disable\' or re-run this script with \'--with-compat\' option.") textui.print_plain("The compat plug-in is enabled. This can increase the memory requirements during migration. Disable the compat plug-in with \'ipa-compat-manage disable\' or re-run this script with \'--with-compat\' option.")
return 1 return 1
any_migrated = any(result['result'].values())
textui.print_plain('Migrated:') textui.print_plain('Migrated:')
textui.print_entry1( textui.print_entry1(
result['result'], attr_order=self.migrate_order, result['result'], attr_order=self.migrate_order,
@ -932,5 +927,9 @@ can use their Kerberos accounts.''')
one_value_per_line=True, one_value_per_line=True,
) )
textui.print_plain('-' * len(self.name)) textui.print_plain('-' * len(self.name))
if not any_migrated:
textui.print_plain('No users/groups were migrated from %s' %
ldapuri)
return 1
textui.print_plain(unicode(self.pwd_migration_msg)) textui.print_plain(unicode(self.pwd_migration_msg))