[ARVADOS] created: 5716ec8e19573bd4cbae5c53a0d08e6757d5507d

git at public.curoverse.com git at public.curoverse.com
Fri Oct 17 15:37:08 EDT 2014


        at  5716ec8e19573bd4cbae5c53a0d08e6757d5507d (commit)


commit 5716ec8e19573bd4cbae5c53a0d08e6757d5507d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Oct 17 15:36:49 2014 -0400

    3698: Fix: components keys are symbols, not strings.  Tweaked error message to
    tell you what the invalid output_of actually is.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 6125343..63313fc 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -445,11 +445,10 @@ class WhRunPipelineInstance
         if value.nil? and
             ![false,'false',0,'0'].index parameter[:required]
           if parameter[:output_of]
-            if not @components[parameter[:output_of]]
-              errors << [componentname, parametername, "output_of refers to nonexistent component"]
-            else
-              next
+            if not @components[parameter[:output_of].intern]
+              errors << [componentname, parametername, "output_of refers to nonexistent component '#{parameter[:output_of]}'"]
             end
+            next
           end
           errors << [componentname, parametername, "required parameter is missing"]
         end

commit 578b33f14aa596ade0fb249b5e9f40d129fad011
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Oct 17 15:17:01 2014 -0400

    3698: Add check that output_of refers to an actual component.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index b70fd7d..6125343 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -445,7 +445,11 @@ class WhRunPipelineInstance
         if value.nil? and
             ![false,'false',0,'0'].index parameter[:required]
           if parameter[:output_of]
-            next
+            if not @components[parameter[:output_of]]
+              errors << [componentname, parametername, "output_of refers to nonexistent component"]
+            else
+              next
+            end
           end
           errors << [componentname, parametername, "required parameter is missing"]
         end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list