diff --git a/worker/provider_test.go b/worker/provider_test.go index 4ff5a6c..d7d756b 100644 --- a/worker/provider_test.go +++ b/worker/provider_test.go @@ -614,7 +614,7 @@ exit 0 targetDir, fmt.Sprintf( "-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 "+ + "--include=*.diff/ --include=by-hash/ --exclude=*.diff/Index --exclude=Contents* --exclude=Packages* --exclude=Sources* --exclude=Release* --exclude=InRelease --exclude=i18n/* --exclude=dep11/* --exclude=installer-*/current --exclude=ls-lR* --timeout=30 -6 "+ "--exclude-from %s %s %s", provider.excludeFile, provider.upstreamURL, provider.WorkingDir(), ), @@ -656,7 +656,7 @@ exit 0 expectedOutput := fmt.Sprintf( "-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 "+ + "--include=*.diff/ --include=by-hash/ --exclude=*.diff/Index --exclude=Contents* --exclude=Packages* --exclude=Sources* --exclude=Release* --exclude=InRelease --exclude=i18n/* --exclude=dep11/* --exclude=installer-*/current --exclude=ls-lR* --timeout=30 -6 "+ "--exclude-from %s %s %s\n", provider.excludeFile, provider.upstreamURL, provider.WorkingDir(), ) diff --git a/worker/two_stage_rsync_provider.go b/worker/two_stage_rsync_provider.go index 7063991..5efd87c 100644 --- a/worker/two_stage_rsync_provider.go +++ b/worker/two_stage_rsync_provider.go @@ -36,7 +36,20 @@ type twoStageRsyncProvider struct { // ref: https://salsa.debian.org/mirror-team/archvsync/-/blob/master/bin/ftpsync#L431 var rsyncStage1Profiles = map[string]([]string){ - "debian": []string{"--include=*.diff/", "--exclude=*.diff/Index", "--exclude=Packages*", "--exclude=Sources*", "--exclude=Release*", "--exclude=InRelease", "--include=i18n/by-hash", "--exclude=i18n/*", "--exclude=ls-lR*"}, + "debian": []string{ + "--include=*.diff/", + "--include=by-hash/", + "--exclude=*.diff/Index", + "--exclude=Contents*", + "--exclude=Packages*", + "--exclude=Sources*", + "--exclude=Release*", + "--exclude=InRelease", + "--exclude=i18n/*", + "--exclude=dep11/*", + "--exclude=installer-*/current", + "--exclude=ls-lR*", + }, "debian-oldstyle": []string{ "--exclude=Packages*", "--exclude=Sources*", "--exclude=Release*", "--exclude=InRelease", "--exclude=i18n/*", "--exclude=ls-lR*", "--exclude=dep11/*",