Merge branch 'master' into 4878-rerun-job

[arvados.git] / apps / workbench / app / controllers / actions_controller.rb

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 17259e07def738ac19906d16e694545b33fa709e..59dcbb92bb9c57db69fc15277233a0072fd73dac 100644 (file)
--- 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