[ARVADOS] updated: 1.3.0-2778-g81c2dc65f

[Git user]

Summary of changes:
 sdk/python/arvados/commands/federation_migrate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  81c2dc65f87ccc098695658d427270f7a3426f6d (commit)
      from  5147b5515a59202940c55b5fb78eea270af78bb8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 81c2dc65f87ccc098695658d427270f7a3426f6d
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Jul 14 18:33:17 2020 -0300

    16589: Changes error message wording.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/python/arvados/commands/federation_migrate.py b/sdk/python/arvados/commands/federation_migrate.py
index 11f9d14d3..5c1bb29e7 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))
 

-----------------------------------------------------------------------


hooks/post-receive
--