projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19099-singularity-container-shell'
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_site.go
diff --git
a/sdk/go/arvados/fs_site.go
b/sdk/go/arvados/fs_site.go
index 5225df59ee58ec4c2017054f59ca68ee7936e41e..3892be1e9a97610522a1fc219d5c0fb807788e4c 100644
(file)
--- a/
sdk/go/arvados/fs_site.go
+++ b/
sdk/go/arvados/fs_site.go
@@
-133,7
+133,7
@@
func (fs *customFileSystem) Stale(t time.Time) bool {
}
func (fs *customFileSystem) newNode(name string, perm os.FileMode, modTime time.Time) (node inode, err error) {
}
func (fs *customFileSystem) newNode(name string, perm os.FileMode, modTime time.Time) (node inode, err error) {
- return nil, ErrInvalid
Argument
+ return nil, ErrInvalid
Operation
}
func (fs *customFileSystem) mountByID(parent inode, id string) inode {
}
func (fs *customFileSystem) mountByID(parent inode, id string) inode {
@@
-179,7
+179,7
@@
func (fs *customFileSystem) newProjectNode(root inode, name, uuid string) inode
}
}
}
}
-// vdirnode wraps an inode by rejecting (with ErrInvalid
Argument
)
+// vdirnode wraps an inode by rejecting (with ErrInvalid
Operation
)
// calls that add/replace children directly, instead calling a
// create() func when a non-existing child is looked up.
//
// calls that add/replace children directly, instead calling a
// create() func when a non-existing child is looked up.
//
@@
-204,7
+204,7
@@
func (vn *vdirnode) Child(name string, replace func(inode) (inode, error)) (inod
} else if tryRepl, err := replace(existing); err != nil {
return existing, err
} else if tryRepl != existing {
} else if tryRepl, err := replace(existing); err != nil {
return existing, err
} else if tryRepl != existing {
- return existing, ErrInvalid
Argument
+ return existing, ErrInvalid
Operation
} else {
return existing, nil
}
} else {
return existing, nil
}