From: Lucas Di Pentima Date: Tue, 14 Jul 2020 21:33:17 +0000 (-0300) Subject: 16589: Changes error message wording. X-Git-Tag: 2.1.0~164^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/81c2dc65f87ccc098695658d427270f7a3426f6d 16589: Changes error message wording. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/sdk/python/arvados/commands/federation_migrate.py b/sdk/python/arvados/commands/federation_migrate.py index 11f9d14d39..5c1bb29e76 100755 --- a/sdk/python/arvados/commands/federation_migrate.py +++ b/sdk/python/arvados/commands/federation_migrate.py @@ -320,7 +320,7 @@ def migrate_user(args, migratearv, email, new_user_uuid, old_user_uuid): name_collision = re.search(r'Key \(owner_uuid, name\)=\((.*?), (.*?)\) already exists\.\n.*UPDATE "(.*?)"', e._get_reason()) if name_collision: target_owner, rsc_name, rsc_type = name_collision.groups() - print("(%s) Target owner %s already has a %s named '%s', skipping. Please rename it or use --data-into-subproject to migrate all users' data into a special subproject." % (email, target_owner, rsc_type[:-1], rsc_name)) + print("(%s) Cannot migrate to %s because both origin and target users have a %s named '%s'. Please rename the conflicting items or use --data-into-subproject to migrate all users' data into a special subproject." % (email, target_owner, rsc_type[:-1], rsc_name)) else: print("(%s) Skipping user migration because of error: %s" % (email, e))