[ARVADOS] updated: 1.3.0-1820-gab26a9efd

[Git user]

Summary of changes:
 sdk/python/arvados/commands/arv_copy.py | 9 +++++----
 services/api/app/models/user.rb         | 2 +-
 services/api/test/unit/user_test.rb     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

       via  ab26a9efdb841318959abf2a263d3542da3b182e (commit)
      from  a08925b4cbc532316b1aade3bbadc17a4399cc97 (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 ab26a9efdb841318959abf2a263d3542da3b182e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Oct 30 20:14:54 2019 -0400

    Fix typo.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 8850d0bfd..0ba3f0a48 100755
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -642,10 +642,11 @@ def create_collection_from(c, src, dst, args):
 #
 def copy_collection(obj_uuid, src, dst, args):
     if arvados.util.keep_locator_pattern.match(obj_uuid):
-        # If the obj_uuid is a portable data hash, it might not be uniquely
-        # identified with a particular collection.  As a result, it is
-        # ambigious as to what name to use for the copy.  Apply some heuristics
-        # to pick which collection to get the name from.
+        # If the obj_uuid is a portable data hash, it might not be
+        # uniquely identified with a particular collection.  As a
+        # result, it is ambiguous as to what name to use for the copy.
+        # Apply some heuristics to pick which collection to get the
+        # name from.
         srccol = src.collections().list(
             filters=[['portable_data_hash', '=', obj_uuid]],
             order="created_at asc"
diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 564274bc9..50ecc6b65 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -426,7 +426,7 @@ class User < ArvadosModel
         if !primary_user
           primary_user = user.redirects_to
         elsif primary_user.uuid != user.redirects_to.uuid
-          raise "Ambigious email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}"
+          raise "Ambiguous email address, directs to both #{primary_user.uuid} and #{user.redirects_to.uuid}"
         end
       end
     end
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index 28685267b..adc37cc59 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -843,7 +843,7 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "Baratheon", nbs.last_name
   end
 
-  test "fail when email address is ambigious" do
+  test "fail when email address is ambiguous" do
     User.register({"email" => "active-user at arvados.local"})
     u = User.register({"email" => "never-before-seen-user at arvados.local"})
     u.email = "active-user at arvados.local"

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


hooks/post-receive
--