combine: throw error if duplicate directory name is specified

See: https://forum.rclone.org/t/v1-59-combine-qs/31814
2022-07-10 15:40:30 +01:00 · 2022-07-10 15:40:30 +01:00 · 80c5850ee8
parent 727387ab1e
commit 80c5850ee8
1 changed files with 6 additions and 2 deletions
--- a/backend/combine/combine.go
+++ b/backend/combine/combine.go
@ -206,9 +206,13 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (outFs fs
 				return err
 			}
 			mu.Lock()
-			f.upstreams[dir] = u
+			if _, found := f.upstreams[dir]; found {
+				err = fmt.Errorf("duplicate directory name %q", dir)
+			} else {
+				f.upstreams[dir] = u
+			}
 			mu.Unlock()
-			return nil
+			return err
 		})
 	}
 	err = g.Wait()