operations: fix DeleteFile/DeleteFiles to respect --backup-dir#9415
Open
superShen0916 wants to merge 1 commit into
Open
operations: fix DeleteFile/DeleteFiles to respect --backup-dir#9415superShen0916 wants to merge 1 commit into
superShen0916 wants to merge 1 commit into
Conversation
DeleteFile and DeleteFiles previously always passed nil as the backupDir parameter, meaning --backup-dir was never used when deleting files. This was contrary to the comment on DeleteFile which stated that --backup-dir would be respected. Fix both functions to check the configured --backup-dir and pass it through to the underlying WithBackupDir variants. Fixes rclone#7566 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: shenpeng.sp0916 <shenpeng.sp0916@bytedance.com>
7871382 to
bf25dba
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #7566 -
DeleteFileandDeleteFilesnow actually respect the--backup-dirflag instead of always passing nil.Before: Both functions always deleted files regardless of
--backup-dir:After: Both functions check
--backup-dirconfig and move files to the backup directory when configured:Changes
fs/operations/operations.go: UpdatedDeleteFileandDeleteFilesto look up--backup-dirfrom config and pass it to the underlyingDeleteFileWithBackupDir/DeleteFilesWithBackupDirfunctionsTest plan
go build ./fs/operations/succeeds