[ARVADOS] created: 1.3.0-219-gade824928

[Git user]

        at  ade82492825d6b78e2da35822e80f79a03e6ea67 (commit)


commit ade82492825d6b78e2da35822e80f79a03e6ea67
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Feb 4 15:37:07 2019 -0500

    14539: crunch-job handles quoted ':' in docker image id filename
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index b8afe638a..0259ecb19 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -2162,6 +2162,8 @@ sub find_docker_image {
   }
   if (defined($filename) and ($filename =~ /^((?:sha256:)?[0-9A-Fa-f]{64})\.tar$/)) {
     return ($streamname, $1);
+  } elsif (defined($filename) and ($filename =~ /^(sha256\\072)([0-9A-Fa-f]{64})\.tar$/)) {
+    return ($streamname, "sha256:$2");
   } else {
     return (undef, undef);
   }

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


hooks/post-receive
--