SunRed/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed nspawn failing to upgrade chroot due to mirror timeout

Browse Source
This commit is contained in:
Giovanni Harting
2021-11-02 08:43:50 +01:00
parent aca9487b49
commit 93af6fe03d
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils.go
View File

@@ -423,14 +423,14 @@ func genSRCINFO(pkgbuild string) (*srcinfo.Srcinfo, error) {
return info, nil
}
func setupChroot() {
func setupChroot() error {
if _, err := os.Stat(filepath.Join(conf.Basedir.Chroot, pristineChroot)); err == nil {
//goland:noinspection SpellCheckingInspection
cmd := exec.Command("arch-nspawn", filepath.Join(conf.Basedir.Chroot, pristineChroot), "pacman", "-Syuu", "--noconfirm")
res, err := cmd.CombinedOutput()
log.Debug(string(res))
if err != nil {
log.Fatalf("[NSPAWN] Unable to update chroot: %v\n%s", err, string(res))
return fmt.Errorf("Unable to update chroot: %v\n%s", err, string(res))
}
} else if os.IsNotExist(err) {
err := os.MkdirAll(conf.Basedir.Chroot, os.ModePerm)
@@ -440,11 +440,12 @@ func setupChroot() {
res, err := cmd.CombinedOutput()
log.Debug(string(res))
if err != nil {
log.Fatalf("[MKCHROOT] Unable to create chroot: %v\n%s", err, string(res))
return fmt.Errorf("Unable to create chroot: %v\n%s", err, string(res))
}
} else {
check(err)
return err
}
return nil
}
func getDBPkgFromPkgfile(pkg string) (*ent.DbPackage, error) {