17417: Add arm64 packages for our Golang components.

[arvados.git] / sdk / python / arvados / commands / federation_migrate.py

diff --git a/sdk/python/arvados/commands/federation_migrate.py b/sdk/python/arvados/commands/federation_migrate.py
index 11f9d14d3956b32514660edd3010e2bc19429255..5c1bb29e764c549d1612bb13f2890a076866fc74 100755 (executable)
--- 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))