[ARVADOS] updated: b22f6f25891fc9b97d07ef145cfa424f5c532aeb

git at public.curoverse.com git at public.curoverse.com
Thu Jun 26 15:14:41 EDT 2014


Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb | 4 +---
 services/fuse/arvados_fuse/__init__.py               | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

       via  b22f6f25891fc9b97d07ef145cfa424f5c532aeb (commit)
       via  874cbef45d163e104908393f0a92b53ecf5b7aff (commit)
      from  f82e5b3b99808ca1b95b9cc55655dd885d5e491f (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 b22f6f25891fc9b97d07ef145cfa424f5c532aeb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 26 15:14:38 2014 -0400

    Remove import from __future__

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index a5e9271..2bbf137 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -2,7 +2,6 @@
 # FUSE driver for Arvados Keep
 #
 
-from __future__ import print_function
 import os
 import sys
 

commit 874cbef45d163e104908393f0a92b53ecf5b7aff
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 26 15:13:37 2014 -0400

    Remove spurious 'puts'

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index cae7f16..9a76e9a 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -72,7 +72,6 @@ class ActionsController < ApplicationController
 
   def arv_normalize mt, *opts
     r = ""
-    puts "['arv-normalize', #{opts}]"
     IO.popen(['arv-normalize'] + opts, 'w+b') do |io|
       io.write mt
       io.close_write
@@ -145,8 +144,7 @@ class ActionsController < ApplicationController
     IO.popen([env, 'arv-put', '--raw'], 'w+b') do |io|
       io.write normalized_stripped
       io.close_write
-      while buf = io.read(2**20)
-
+      while buf = io.read(2**16)
       end
     end
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list