[ARVADOS] updated: d8f97ca48cd194895fedbefbaa022196d25828f8

git at public.curoverse.com git at public.curoverse.com
Wed Sep 17 10:59:55 EDT 2014


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

       via  d8f97ca48cd194895fedbefbaa022196d25828f8 (commit)
       via  aad2f86f509b34f1507bd5530bc458daf14feb41 (commit)
      from  37ab78a4c99a7b8534556881e6eb77d335abd9e3 (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 d8f97ca48cd194895fedbefbaa022196d25828f8
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 17 10:57:41 2014 -0400

    3550: Fix running local job repeatedly on subsequent loop iterations.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 0adfc83..dee57b0 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -537,7 +537,7 @@ class WhRunPipelineInstance
           end
         end
 
-        if c[:job] and c[:run_in_process]
+        if c[:job] and c[:run_in_process] and c[:job][:success].nil?
           report_status
           begin
             require 'open3'

commit aad2f86f509b34f1507bd5530bc458daf14feb41
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 17 10:48:13 2014 -0400

    3550: Add missing .andand

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index ab8ff0a..0adfc83 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -597,7 +597,7 @@ class WhRunPipelineInstance
               # succeeded. (At the top of this loop, I was still
               # waiting for it to finish.)
 
-              if @instance[:name].andand.length > 0
+              if @instance[:name].andand.length.andand > 0
                 pipeline_name = @instance[:name]
               elsif @template.andand[:name].andand.length.andand > 0
                 pipeline_name = @template[:name]

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list