force overrides trace and update x.org repo

pull/3/head
Andrew Wang 4 months ago
parent 3c7cb13769
commit 39fc29a0a8
  1. 14
      merlin/Handoff.md
  2. 12
      merlin/merlin-config.ini
  3. 6
      merlin/sync/interface.go

@ -1,4 +1,4 @@
## Status of moving from merlin to merlin-go
## Status of Mirror Synchronization
- [x] debian
- [ ] ubuntu (successful but too slow)
- [ ] ubuntu-ports (successful but too slow)
@ -10,7 +10,7 @@
- [x] xubuntu-releases
- [ ] puppylinux (broken)
- [ ] CPAN (unstable)
- [ ] CRAN <
- [x] CRAN
- [x] CTAN
- [ ] fedora-epel (some attrs not transfered)
- [x] cygwin
@ -26,13 +26,13 @@
- [ ] eclipse (unstable)
- [x] kde
- [x] kde-applicationdata
- [ ] archlinux <
- [x] archlinux
- [x] artixlinx
- [x] slackware
- [x] debian-cd
- [x] x.org
- [ ] x.org < (test with new sync location)
- [x] centos
- [x] opensuse
- [ ] opensuse <
- [x] FreeBSD
- [ ] fedora-enchilada (broken: some attrs not transfered)
- [x] ubuntu-ports-releases
@ -48,7 +48,7 @@
- [x] sagemath
- [x] vlc
- [x] tdf
- [ ] saltstack <
- [x] saltstack
- [ ] alpine (unstable)
- [ ] raspbian (broken: too slow and failing)
- [x] raspberrypi
@ -62,7 +62,7 @@
- [x] almalinux
- [x] ceph
### Other Repos
### Repos not being synced
- debian-cdimage
- debian-volatile
- emdebian

@ -100,7 +100,6 @@ rsync_host = cpan-rsync.perl.org
rsync_dir = CPAN
[CRAN]
verbose = true
sync_type = csc-sync-ssh
frequency = twice-daily
local_dir = CRAN
@ -222,7 +221,6 @@ rsync_dir = applicationdata
; our rsync_host is rsync://rsync.archlinux.org/ftp_tier1
[archlinux]
; csc-sync-standard archlinux archlinux.mirror.rafal.ca archlinux
verbose = true
sync_type = csc-sync-archlinux
frequency = five-minutely
local_dir = archlinux
@ -252,14 +250,16 @@ rsync_host = cdimage.debian.org
rsync_dir = debian-cd
[x.org]
; rsync://mirrors.ircam.fr/pub/x.org/
verbose = true
; csc-sync-standard x.org xorg.freedesktop.org xorg-archive
; csc-sync-standard x.org mirror.us.leaseweb.net xorg
sync_type = csc-sync-standard
frequency = twice-daily
local_dir = x.org
rsync_host = rsync.mirrorservice.org
rsync_dir = ftp.x.org/pub/
rsync_host = mirrors.ircam.fr
rsync_dir = pub/x.org/
; rsync_host = rsync.mirrorservice.org
; rsync_dir = ftp.x.org/pub/
[centos]
sync_type = csc-sync-standard
@ -269,6 +269,7 @@ rsync_host = us-msync.centos.org
rsync_dir = CentOS
[opensuse]
verbose = true
; unsure what this setting is supposed to do
; #"--exclude distribution/.timestamp_invisible"
sync_type = csc-sync-standard
@ -396,7 +397,6 @@ rsync_host = rsync.documentfoundation.org
rsync_dir = tdf-pub
[saltstack]
verbose = true
sync_type = csc-sync-s3
frequency = daily
local_dir = saltstack

@ -21,7 +21,7 @@ func SyncIfPossible(repo *config.Repo, force bool) bool {
repo.SaveState()
repo.Logger.Info(fmt.Sprintf("Repo %s has started syncing", repo.Name))
go startRepoSync(repo)
go startRepoSync(repo, force)
return true
}
return false
@ -48,7 +48,7 @@ func SyncCompleted(repo *config.Repo, exit int) {
}
// begin and manage the steps of the sync and return the exit status
func startRepoSync(repo *config.Repo) {
func startRepoSync(repo *config.Repo, force bool) {
status := config.FAILURE
done := false
@ -60,7 +60,7 @@ func startRepoSync(repo *config.Repo) {
}()
status, done = preRepoSync(repo)
if done {
if done && !force {
return
}

Loading…
Cancel
Save