[ARVADOS] updated: d5d43d27278622f21464b9dea1a0542cdecc6ee4

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/pipeline_instance.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  d5d43d27278622f21464b9dea1a0542cdecc6ee4 (commit)
      from  fbf2382d1455a3663e04e07931bc39b1ab088172 (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 d5d43d27278622f21464b9dea1a0542cdecc6ee4
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Apr 27 11:05:56 2015 -0400

    5554: Fixup pipeline instance model to avoid duplication.

diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index 01bd64d..03d70b2 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -1,3 +1,5 @@
+require "arvados/keep"
+
 class PipelineInstance < ArvadosBase
   attr_accessor :pipeline_template
 
@@ -112,8 +114,9 @@ class PipelineInstance < ArvadosBase
   end
 
   def has_readable_logs?
-    log_pdhs, log_uuids =
-      job_log_ids.values.compact.partition { |s| s =~ /^[0-9a-f]{32}\b/ }
+    log_pdhs, log_uuids = job_log_ids.values.compact.partition do |loc_s|
+      Keep::Locator.parse(loc_s)
+    end
     if log_pdhs.any? and
         Collection.where(portable_data_hash: log_pdhs).limit(1).results.any?
       true

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


hooks/post-receive
--