[ARVADOS] updated: 2.1.0-1890-g3c3d72f30

[Git user]

Summary of changes:
 lib/crunchrun/crunchrun_test.go | 8 ++++++++
 sdk/go/arvados/fs_base.go       | 2 +-
 services/keep-web/s3.go         | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

       via  3c3d72f3076f164c79a10e089b80a098ecec5ff8 (commit)
       via  a3c509e8eca36f1291f7547999f16d9fd127c4a0 (commit)
      from  23bad0a705b1809a73ffbd5f6866e14dde5dd52e (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 3c3d72f3076f164c79a10e089b80a098ecec5ff8
Author: Tom Clegg <tom at curii.com>
Date:   Thu Feb 10 15:52:49 2022 -0500

    18600: Update tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go
index 2ec35f055..f961ec8f4 100644
--- a/lib/crunchrun/crunchrun_test.go
+++ b/lib/crunchrun/crunchrun_test.go
@@ -364,6 +364,14 @@ func (fw FileWrapper) Sync() error {
 	return errors.New("not implemented")
 }
 
+func (fw FileWrapper) Snapshot() (*arvados.Subtree, error) {
+	return nil, errors.New("not implemented")
+}
+
+func (fw FileWrapper) Splice(*arvados.Subtree) error {
+	return errors.New("not implemented")
+}
+
 func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (arvados.File, error) {
 	if filename == hwImageID+".tar" {
 		rdr := ioutil.NopCloser(&bytes.Buffer{})
diff --git a/services/keep-web/s3.go b/services/keep-web/s3.go
index e6262374d..5af7ebb5d 100644
--- a/services/keep-web/s3.go
+++ b/services/keep-web/s3.go
@@ -471,7 +471,7 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 					return true
 				}
 				err = fs.Mkdir(dir, 0755)
-				if err == arvados.ErrInvalidArgument {
+				if errors.Is(err, arvados.ErrInvalidArgument) || errors.Is(err, arvados.ErrInvalidOperation) {
 					// Cannot create a directory
 					// here.
 					err = fmt.Errorf("mkdir %q failed: %w", dir, err)

commit a3c509e8eca36f1291f7547999f16d9fd127c4a0
Author: Tom Clegg <tom at curii.com>
Date:   Thu Feb 10 15:29:38 2022 -0500

    18600: Update comment.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/arvados/fs_base.go b/sdk/go/arvados/fs_base.go
index 719e0e08a..5bccdc51d 100644
--- a/sdk/go/arvados/fs_base.go
+++ b/sdk/go/arvados/fs_base.go
@@ -742,7 +742,7 @@ func Snapshot(fs FileSystem, path string) (*Subtree, error) {
 //
 // Splice returns an error if target is not inside a collection.
 //
-// Splice returns an error if target is an existing directory and
+// Splice returns an error if target is the root of a collection and
 // newsubtree is a snapshot of a file.
 func Splice(fs FileSystem, target string, newsubtree *Subtree) error {
 	f, err := fs.OpenFile(target, os.O_WRONLY, 0)

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


hooks/post-receive
--