[ARVADOS] updated: 70e7bc032c4d4e394ad1a7b47984b0be38a5ed20

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/actions_controller.rb          | 30 ++--------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

       via  70e7bc032c4d4e394ad1a7b47984b0be38a5ed20 (commit)
      from  37d93ae5b99f202b38c50e037a0ee8e600d97f05 (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 70e7bc032c4d4e394ad1a7b47984b0be38a5ed20
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 26 00:20:13 2014 -0400

    Remove uuid-guessing code from "combine selected files". refs #3504

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index fd4ebc4..7005ef9 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -139,39 +139,13 @@ class ActionsController < ApplicationController
     end
 
     normalized = arv_normalize combined
-    normalized_stripped = arv_normalize combined, '--strip'
-
-    require 'digest/md5'
-
-    d = Digest::MD5.new()
-    d << normalized_stripped
-    newuuid = "#{d.hexdigest}+#{normalized_stripped.length}"
-
-    env = Hash[ENV].
-      merge({
-              'ARVADOS_API_HOST' =>
-              arvados_api_client.arvados_v1_base.
-              sub(/\/arvados\/v1/, '').
-              sub(/^https?:\/\//, ''),
-              'ARVADOS_API_TOKEN' => Thread.current[:arvados_api_token],
-              'ARVADOS_API_HOST_INSECURE' =>
-              Rails.configuration.arvados_insecure_https ? 'true' : 'false'
-            })
-
-    IO.popen([env, 'arv-put', '--raw'], 'w+b') do |io|
-      io.write normalized_stripped
-      io.close_write
-      while buf = io.read(2**16)
-      end
-    end
-
-    newc = Collection.new({:uuid => newuuid, :manifest_text => normalized})
+    newc = Collection.new({:manifest_text => normalized})
     newc.save!
 
     chash.each do |k,v|
       l = Link.new({
                      tail_uuid: k,
-                     head_uuid: newuuid,
+                     head_uuid: newc.uuid,
                      link_class: "provenance",
                      name: "provided"
                    })

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


hooks/post-receive
--