Skip to content

Commit 102a2c5

Browse files
committed
pass only object not found error
1 parent dacee4c commit 102a2c5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

internal/fs/copy_move.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,12 @@ func (t *FileTransferTask) RunWithNextTaskCallback(f func(nextTask *FileTransfer
191191

192192
existedObjs := make(map[string]bool)
193193
if t.TaskType == merge {
194-
dstObjs, _ := op.List(t.Ctx(), t.DstStorage, dstActualPath, model.ListArgs{})
194+
dstObjs, err := op.List(t.Ctx(), t.DstStorage, dstActualPath, model.ListArgs{})
195+
if err != nil && !errors.Is(err, errs.ObjectNotFound) {
196+
// 目标文件夹不存在的情况不是错误,会在之后新建文件夹
197+
// 这种情况显然不需要统计existedObjs,dstObjs保持为nil,下面这个for将不会执行
198+
return errors.WithMessagef(err, "failed list dst [%s] objs", dstActualPath)
199+
}
195200
for _, obj := range dstObjs {
196201
if err := t.Ctx().Err(); err != nil {
197202
return err

0 commit comments

Comments
 (0)