12183: Fix renamed symbol
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Thu, 2 Nov 2017 13:32:40 +0000 (09:32 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Thu, 2 Nov 2017 13:32:40 +0000 (09:32 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

services/crunch-run/crunchrun.go

index ca46bb0eaa14b81f41275de0afb9cfcf268f2a47..b3e6a4cd1eda28ac5dc4bf399c88b6c7a0ea2d49 100644 (file)
@@ -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