[ARVADOS] updated: 1.1.0-52-gcd0e7f0
Git user
git at public.curoverse.com
Thu Nov 2 09:32:57 EDT 2017
Summary of changes:
services/crunch-run/crunchrun.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
via cd0e7f06116925d66cc370a03cef1b8c19d0002d (commit)
from 0eb79244613af42e17effc4437637da282bdaace (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 cd0e7f06116925d66cc370a03cef1b8c19d0002d
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Thu Nov 2 09:32:40 2017 -0400
12183: Fix renamed symbol
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index ca46bb0..b3e6a4c 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1012,7 +1012,7 @@ func (runner *ContainerRunner) UploadOutputFile(
relocated := relocateTo + path[len(relocateFrom):]
tgt, readlinktgt, info, derefErr := runner.derefOutputSymlink(path, info)
- if derefErr != nil && derefErr != NotInOutputDirError {
+ if derefErr != nil && derefErr != ErrNotInOutputDir {
return "", derefErr
}
@@ -1037,7 +1037,7 @@ func (runner *ContainerRunner) UploadOutputFile(
// If target is not a collection mount, it must be located within the
// output directory, otherwise it is an error.
- if derefErr == NotInOutputDirError {
+ if derefErr == ErrNotInOutputDir {
err = fmt.Errorf("Symlink in output %q points to invalid location %q, must point to path within the output directory.",
path[len(runner.HostOutputDir):], readlinktgt)
return
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list