[ARVADOS] updated: d35d434047cf36206ec5780e2d422bc0f4f84ea4

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

       via  d35d434047cf36206ec5780e2d422bc0f4f84ea4 (commit)
       via  aa1e4c45da76894d64199acb89efdc50b8bb7756 (commit)
      from  672df7ed5ffe0aae1eaa948438de9d54aed61038 (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 d35d434047cf36206ec5780e2d422bc0f4f84ea4
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 16 16:00:11 2014 -0400

    3550: Fix crash when --template loaded from local JSON file has no uuid.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index d54fbc4..acafc2c 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -597,12 +597,12 @@ class WhRunPipelineInstance
               # succeeded. (At the top of this loop, I was still
               # waiting for it to finish.)
 
-              debuglog "names: #{@instance[:name]} #{@template[:name]}", 0
-              if (not @instance[:name].nil?) and (not @instance[:name].empty?)
+              if @instance[:name].andand.length > 0
                 pipeline_name = @instance[:name]
-              else
-                fetch_template(@instance[:pipeline_template_uuid])
+              elsif @template.andand[:name].andand.length > 0
                 pipeline_name = @template[:name]
+              else
+                pipeline_name = @instance[:uuid]
               end
               if c[:output_name] != false
                 # Create a collection located in the same project as the pipeline with the contents of the output.

commit aa1e4c45da76894d64199acb89efdc50b8bb7756
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 16 15:59:04 2014 -0400

    3550: Remove extraneous "to" in usage message.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index f529db0..d54fbc4 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -151,7 +151,7 @@ p = Trollop::Parser.new do
       :short => :none,
       :type => :string)
   opt(:submit,
-      "Submit the pipeline instance to the server, and exit. Let the Crunch dispatch service to satisfy the components by finding/running jobs.",
+      "Submit the pipeline instance to the server, and exit. Let the Crunch dispatch service satisfy the components by finding/running jobs.",
       :short => :none,
       :type => :boolean)
   opt(:run_pipeline_here,

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


hooks/post-receive
--