From b3d4abd885ee26414908a472bf1767d49c0b5e33 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Sun, 24 Jul 2022 19:08:15 +0000 Subject: [PATCH] enable every csc-sync-debian --- merlin/Handoff.md | 2 +- merlin/merlin-config.ini | 14 -------------- merlin/sync/trace.go | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/merlin/Handoff.md b/merlin/Handoff.md index 0a135c5..f892270 100644 --- a/merlin/Handoff.md +++ b/merlin/Handoff.md @@ -1,5 +1,5 @@ ## Status of moving from merlin to merlin-go -- [ ] debian < +- [x] debian - [ ] ubuntu < - [ ] ubuntu-ports < - [ ] linuxmint-packages < diff --git a/merlin/merlin-config.ini b/merlin/merlin-config.ini index bb47b6f..ae2e236 100644 --- a/merlin/merlin-config.ini +++ b/merlin/merlin-config.ini @@ -14,8 +14,6 @@ zfssync_log_dir = /home/mirror-go/merlin/log-zfssync sock_path = /mirror/merlin/run/merlin-go.sock [debian] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = debian @@ -23,8 +21,6 @@ rsync_host = debian.mirror.rafal.ca rsync_dir = debian [ubuntu] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = ubuntu @@ -33,8 +29,6 @@ rsync_dir = ubuntu trace_host = drescher.canonical.com [ubuntu-ports] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = ubuntu-ports @@ -43,8 +37,6 @@ rsync_dir = ubuntu-ports trace_host = drescher.canonical.com [linuxmint-packages] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = linuxmint-packages @@ -52,8 +44,6 @@ rsync_host = rsync-packages.linuxmint.com rsync_dir = packages [debian-multimedia] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = debian-multimedia @@ -61,8 +51,6 @@ rsync_host = www.deb-multimedia.org rsync_dir = deb [debian-backports] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = bi-hourly local_dir = debian-backports @@ -70,8 +58,6 @@ rsync_host = debian.mirror.rafal.ca rsync_dir = debian-backports [debian-security] -dry_run = true -verbose = true sync_type = csc-sync-debian frequency = twice-hourly local_dir = debian-security diff --git a/merlin/sync/trace.go b/merlin/sync/trace.go index 64ef7bf..cdafb49 100644 --- a/merlin/sync/trace.go +++ b/merlin/sync/trace.go @@ -73,7 +73,7 @@ func cscTraceDebianDiff(repo *config.Repo, newTime string) bool { statFile := func(file string) int64 { f, err := os.Stat(file) if err != nil { - repo.Logger.Debug(err.Error()) + repo.Logger.Debug("Error while trying to stat file: " + file) return 0 }