1
0
forked from ALHP/ALHP.GO

fixed nspawn failing to upgrade chroot due to mirror timeout

This commit is contained in:
2021-11-02 08:43:50 +01:00
parent aca9487b49
commit 93af6fe03d
2 changed files with 16 additions and 7 deletions

14
main.go
View File

@@ -492,8 +492,13 @@ func (b *BuildManager) syncWorker() {
// fetch updates between sync runs
b.alpmMutex.Lock()
check(alpmHandle.Release())
setupChroot()
var err error
err := setupChroot()
for err != nil {
log.Warningf("Unable to upgrade chroot, trying again later.")
time.Sleep(time.Minute)
err = setupChroot()
}
alpmHandle, err = initALPM(filepath.Join(conf.Basedir.Chroot, pristineChroot), filepath.Join(conf.Basedir.Chroot, pristineChroot, "/var/lib/pacman"))
check(err)
b.alpmMutex.Unlock()
@@ -614,7 +619,10 @@ func main() {
exit: false,
}
setupChroot()
err = setupChroot()
if err != nil {
log.Fatalf("Unable to setup chroot: %v", err)
}
syncMarchs()
alpmHandle, err = initALPM(filepath.Join(conf.Basedir.Chroot, pristineChroot), filepath.Join(conf.Basedir.Chroot, pristineChroot, "/var/lib/pacman"))