[ARVADOS] updated: c6bc1e96a1d5e58895188b82fb633b709e035e62

git at public.curoverse.com git at public.curoverse.com
Tue Mar 31 11:31:27 EDT 2015

Summary of changes:
 services/api/app/controllers/arvados/v1/users_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

  discards  898bbe80a2705824d24c1e72ed0dcb644e732f2a (commit)
       via  c6bc1e96a1d5e58895188b82fb633b709e035e62 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (898bbe80a2705824d24c1e72ed0dcb644e732f2a)
             N -- N -- N (c6bc1e96a1d5e58895188b82fb633b709e035e62)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 c6bc1e96a1d5e58895188b82fb633b709e035e62
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Mar 31 11:22:27 2015 -0400

    4253: Even stricter about accepted repository names during setup.

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 345cd46..03efed9 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -106,7 +106,8 @@ class Arvados::V1::UsersController < ApplicationController
     elsif @object.username.nil?
       raise ArgumentError.
         new("cannot setup a repository because user has no username")
-    elsif params[:repo_name].include?("/")
+    elsif object_found and
+        params[:repo_name].start_with?("#{@object.username}/")
       full_repo_name = params[:repo_name]
       full_repo_name = "#{@object.username}/#{params[:repo_name]}"



More information about the arvados-commits mailing list