From 9c7f70644057022c31bb816f14b17f7cbd0f3cac Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Fri, 23 Oct 2020 12:43:58 +0800 Subject: [PATCH] Bugfix change the order of options in 2f9e96a Signed-off-by: Miao Wang --- worker/provider_test.go | 10 +++++----- worker/rsync_provider.go | 2 +- worker/two_stage_rsync_provider.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/worker/provider_test.go b/worker/provider_test.go index e963236..4ff5a6c 100644 --- a/worker/provider_test.go +++ b/worker/provider_test.go @@ -91,7 +91,7 @@ exit 0 "Done\n", targetDir, fmt.Sprintf( - "-aHvh --no-o --no-g --stats --exclude .~tmp~/ --filter risk .~tmp~/ "+ + "-aHvh --no-o --no-g --stats --filter risk .~tmp~/ --exclude .~tmp~/ "+ "--delete --delete-after --delay-updates --safe-links "+ "--timeout=120 -6 %s %s", provider.upstreamURL, provider.WorkingDir(), @@ -190,7 +190,7 @@ exit 0 "Done\n", targetDir, fmt.Sprintf( - "%s %s %s -aHvh --no-o --no-g --stats --exclude .~tmp~/ --filter risk .~tmp~/ "+ + "%s %s %s -aHvh --no-o --no-g --stats --filter risk .~tmp~/ --exclude .~tmp~/ "+ "--delete --delete-after --delay-updates --safe-links "+ "--timeout=30 -4 --delete-excluded %s %s", provider.username, provider.password, proxyAddr, @@ -613,14 +613,14 @@ exit 0 "Done\n", targetDir, fmt.Sprintf( - "-aHvh --no-o --no-g --stats --exclude .~tmp~/ --filter risk .~tmp~/ --safe-links "+ + "-aHvh --no-o --no-g --stats --filter risk .~tmp~/ --exclude .~tmp~/ --safe-links "+ "--include=*.diff/ --exclude=*.diff/Index --exclude=Packages* --exclude=Sources* --exclude=Release* --exclude=InRelease --include=i18n/by-hash --exclude=i18n/* --exclude=ls-lR* --timeout=30 -6 "+ "--exclude-from %s %s %s", provider.excludeFile, provider.upstreamURL, provider.WorkingDir(), ), targetDir, fmt.Sprintf( - "-aHvh --no-o --no-g --stats --exclude .~tmp~/ --filter risk .~tmp~/ "+ + "-aHvh --no-o --no-g --stats --filter risk .~tmp~/ --exclude .~tmp~/ "+ "--delete --delete-after --delay-updates --safe-links "+ "--delete-excluded --cache --timeout=30 -6 --exclude-from %s %s %s", provider.excludeFile, provider.upstreamURL, provider.WorkingDir(), @@ -655,7 +655,7 @@ exit 0 So(err, ShouldBeNil) expectedOutput := fmt.Sprintf( - "-aHvh --no-o --no-g --stats --exclude .~tmp~/ --filter risk .~tmp~/ --safe-links "+ + "-aHvh --no-o --no-g --stats --filter risk .~tmp~/ --exclude .~tmp~/ --safe-links "+ "--include=*.diff/ --exclude=*.diff/Index --exclude=Packages* --exclude=Sources* --exclude=Release* --exclude=InRelease --include=i18n/by-hash --exclude=i18n/* --exclude=ls-lR* --timeout=30 -6 "+ "--exclude-from %s %s %s\n", provider.excludeFile, provider.upstreamURL, provider.WorkingDir(), diff --git a/worker/rsync_provider.go b/worker/rsync_provider.go index b8e17c9..fc9b451 100644 --- a/worker/rsync_provider.go +++ b/worker/rsync_provider.go @@ -67,7 +67,7 @@ func newRsyncProvider(c rsyncConfig) (*rsyncProvider, error) { options := []string{ "-aHvh", "--no-o", "--no-g", "--stats", - "--exclude", ".~tmp~/", "--filter" , "risk .~tmp~/", + "--filter" , "risk .~tmp~/", "--exclude", ".~tmp~/", "--delete", "--delete-after", "--delay-updates", "--safe-links", } diff --git a/worker/two_stage_rsync_provider.go b/worker/two_stage_rsync_provider.go index c5721d1..7063991 100644 --- a/worker/two_stage_rsync_provider.go +++ b/worker/two_stage_rsync_provider.go @@ -63,12 +63,12 @@ func newTwoStageRsyncProvider(c twoStageRsyncConfig) (*twoStageRsyncProvider, er twoStageRsyncConfig: c, stage1Options: []string{ "-aHvh", "--no-o", "--no-g", "--stats", - "--exclude", ".~tmp~/", "--filter", "risk .~tmp~/", + "--filter", "risk .~tmp~/", "--exclude", ".~tmp~/", "--safe-links", }, stage2Options: []string{ "-aHvh", "--no-o", "--no-g", "--stats", - "--exclude", ".~tmp~/", "--filter", "risk .~tmp~/", + "--filter", "risk .~tmp~/", "--exclude", ".~tmp~/", "--delete", "--delete-after", "--delay-updates", "--safe-links", },