haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-09 11:18:54 +00:00
Code Issues Releases Wiki Activity

Fix get fs-id-list for virtual repos (#533)

Browse Source
This commit is contained in:
feiniks
2021-12-22 16:01:21 +08:00
committed by GitHub
parent 62fc07fe2e
commit 1c2c981530
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fileserver/sync_api.go
View File

@@ -774,7 +774,6 @@ func getBlockInfo(rsp http.ResponseWriter, r *http.Request) *appError {
} }
sendStatisticMsg(storeID, user, "sync-file-download", uint64(blockSize)) sendStatisticMsg(storeID, user, "sync-file-download", uint64(blockSize))
rsp.WriteHeader(http.StatusOK)
return nil return nil
} }
@@ -867,8 +866,6 @@ func putCommitCB(rsp http.ResponseWriter, r *http.Request) *appError {
return &appError{err, "", http.StatusInternalServerError} return &appError{err, "", http.StatusInternalServerError}
} }
rsp.WriteHeader(http.StatusOK)
return nil return nil
} }
@@ -1231,14 +1228,14 @@ func calculateSendObjectList(ctx context.Context, repo *repomgr.Repo, serverHead
FileCB: collectFileIDs, FileCB: collectFileIDs,
DirCB: collectDirIDs, DirCB: collectDirIDs,
Ctx: ctx, Ctx: ctx,
RepoID: repo.ID} RepoID: repo.StoreID}
opt.Data = &results opt.Data = &results
} else { } else {
opt = &diff.DiffOptions{ opt = &diff.DiffOptions{
FileCB: collectFileIDsNOp, FileCB: collectFileIDsNOp,
DirCB: collectDirIDs, DirCB: collectDirIDs,
Ctx: ctx, Ctx: ctx,
RepoID: repo.ID} RepoID: repo.StoreID}
opt.Data = &results opt.Data = &results
} }
trees := []string{masterHead.RootID, remoteHeadRoot} trees := []string{masterHead.RootID, remoteHeadRoot}