fix(storage): handle pathnotfound for walk call

project-zot · Nov 6, 2023 · 88839b0 · 88839b0
1 parent dd3c246
commit 88839b0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/storage/imagestore/imagestore.go b/pkg/storage/imagestore/imagestore.go
@@ -392,10 +392,18 @@ func (is *ImageStore) GetNextRepository(repo string) (string, error) {
 
 	driverErr := &driver.Error{}
 
+<<<<<<< HEAD
 	// some s3 implementations (eg, digitalocean spaces) will return pathnotfounderror for walk but not list 
 	// therefore, we must also catch that error here. 
 	if errors.As(err, &driver.PathNotFoundError{}) {
 		is.log.Debug().Msg("empty rootDir")
+=======
+	// some s3 implementations (eg, digitalocean spaces) will return pathnotfounderror for walk but not list
+	// therefore, we must also catch that error here.
+	if errors.As(err, &driver.PathNotFoundError{}) {
+		is.log.Debug().Msg("empty rootDir")
+
+>>>>>>> ef0d52e (fix(storage): handle pathnotfound for walk call)
 		return "", nil
 	}