[ARVADOS] updated: 3bf2514da60ab2e0b7639959b650cc4d93784080

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/dates.js     |  2 +-
 .../app/controllers/actions_controller.rb          |  2 +-
 .../test/integration/pipeline_instances_test.rb    | 22 ++++++++++++++++++
 apps/workbench/test/integration/projects_test.rb   |  4 ++--
 services/api/test/fixtures/groups.yml              |  4 ++--
 services/api/test/fixtures/jobs.yml                |  2 +-
 services/api/test/fixtures/pipeline_instances.yml  | 26 +++++++++++++---------
 services/nodemanager/tests/test_daemon.py          |  4 ++--
 8 files changed, 46 insertions(+), 20 deletions(-)

       via  3bf2514da60ab2e0b7639959b650cc4d93784080 (commit)
       via  f2ba19f987bfe7de245176e9fb4ea5e783564494 (commit)
       via  6eaaae29a7af005e417673d79e0951122065e685 (commit)
       via  ff36aa7e753a28cb36bd13e3cd3bbbe4c6617265 (commit)
       via  83fc1e7b7e621be38e43d3d97bd32447ef846eae (commit)
       via  58ead50fe4b7014562c0697290cf933a956ab852 (commit)
       via  99ad159b229c312ef6625e6ef042c33d0db524b9 (commit)
       via  e6359fe13c6b3b4558d703fecdd2f5f1713dc0e9 (commit)
       via  e102efba3f46986b6a2abaee2cc222db8c85198a (commit)
       via  86e8d9a338e3947337898256479fc904b36949c7 (commit)
       via  183df814d5cb49d11614acb73b07e4e2809524e2 (commit)
       via  19c0f65c05c4a4d01bc69d98a33cab6ce61b806b (commit)
       via  972974d7f305426854ad6c2e271c33730905dee1 (commit)
       via  cef5c3f1b3bf267aedc3ff6ed92778040efb3882 (commit)
      from  5870334b03237f04df6de35193f78b838f7ac7dc (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 3bf2514da60ab2e0b7639959b650cc4d93784080
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 17:18:25 2014 -0400

    4228: fix arv_normalize input when a file in a subdir of a collection is being combined.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 17259e0..59dcbb9 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -150,12 +150,7 @@ class ActionsController < ApplicationController
     files.each do |m|
       mt = chash[m[1]+m[2]].andand.manifest_text
       if not m[4].nil? and m[4].size > 1
-        count = m[4].count('/')
-        if count > 1
-          combined += arv_normalize mt, '--extract', ".#{m[4]}"
-        else
-          combined += arv_normalize mt, '--extract', m[4][1..-1]
-        end
+        combined += arv_normalize mt, '--extract', ".#{m[4]}"
       else
         combined += mt
       end

commit f2ba19f987bfe7de245176e9fb4ea5e783564494
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 16:17:50 2014 -0400

    4228: fix arv_normalize input when a file in a subdir of a collection is being combined.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 62533d8..17259e0 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -150,7 +150,12 @@ class ActionsController < ApplicationController
     files.each do |m|
       mt = chash[m[1]+m[2]].andand.manifest_text
       if not m[4].nil? and m[4].size > 1
-        combined += arv_normalize mt, '--extract', m[4][1..-1]
+        count = m[4].count('/')
+        if count > 1
+          combined += arv_normalize mt, '--extract', ".#{m[4]}"
+        else
+          combined += arv_normalize mt, '--extract', m[4][1..-1]
+        end
       else
         combined += mt
       end

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


hooks/post-receive
--