[ARVADOS] updated: fa87d357fdefd594b378cda9b4d73487df60d262

[git at public.curoverse.com]

Summary of changes:
 services/api/script/crunch-dispatch.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

       via  fa87d357fdefd594b378cda9b4d73487df60d262 (commit)
      from  1f760632ae0fbb9f11af5cfb831b7c3ed49a7009 (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 fa87d357fdefd594b378cda9b4d73487df60d262
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jun 6 10:39:39 2014 -0400

    Reverted change a0aba6d "crunch-dispatch now sends a clean environment to crunch-job"

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index ee8076b..3ddf83d 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
-
 include Process
 
 $warned = {}
@@ -22,10 +20,6 @@ if ENV["CRUNCH_DISPATCH_LOCKFILE"]
   end
 end
 
-$trollopts = Trollop::options do
-    opt :use_env, "Pass selected environment variables (PATH, PYTHONPATH, RUBYLIB, GEM_PATH, PERLLIB) to crunch-job"
-end
-
 ENV["RAILS_ENV"] = ARGV[0] || ENV["RAILS_ENV"] || "development"
 
 require File.dirname(__FILE__) + '/../config/boot'
@@ -186,10 +180,10 @@ class Dispatcher
       cmd_args << '--git-dir'
       cmd_args << arvados_internal
 
-      $stderr.puts "dispatch: #{cmd_args}"
+      $stderr.puts "dispatch: #{cmd_args.join ' '}"
 
       begin
-        i, o, e, t = Open3.popen3({}, *cmd_args, { :unsetenv_others => true})
+        i, o, e, t = Open3.popen3(*cmd_args)
       rescue
         $stderr.puts "dispatch: popen3: #{$!}"
         sleep 1

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


hooks/post-receive
--