Fix missed TranslatePaths and unreported error.

[lightning.git] / arvados.go

diff --git a/arvados.go b/arvados.go
index 0eb99686aa748969f4000c47ede9681869971e05..c952a9870c77cab73c35237440555fb2b551ce23 100644 (file)
--- a/arvados.go
+++ b/arvados.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package lightning
 
 import (
@@ -528,8 +532,8 @@ func open(fnm string) (file, error) {
                return os.Open(fnm)
        }
        uuid := m[2]
-       mnt := "/mnt/" + uuid + "/"
-       if !strings.HasPrefix(fnm, mnt) {
+       mnt := "/mnt/" + uuid
+       if fnm != mnt && !strings.HasPrefix(fnm, mnt+"/") {
                return os.Open(fnm)
        }
 
@@ -552,5 +556,5 @@ func open(fnm string) (file, error) {
        }
 
        log.Infof("reading %q from %s using Arvados client", fnm[len(mnt):], uuid)
-       return siteFS.Open("by_id/" + uuid + "/" + fnm[len(mnt):])
+       return siteFS.Open("by_id/" + uuid + fnm[len(mnt):])
 }