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

fixed some minor problems with new package moving

Browse Source
This commit is contained in:
Giovanni Harting
2021-12-20 18:40:20 +01:00
parent e0e76af757
commit 1ccb9be510
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main.go
View File

@@ -216,9 +216,8 @@ func (b *BuildManager) buildWorker(id int, march string) {
for _, file := range pkgFiles {
cmd = exec.Command("gpg", "--batch", "--detach-sign", file)
res, err := cmd.CombinedOutput()
log.Debug(string(res))
if err != nil {
log.Warningf("Failed to sign %s: %s", pkg.Pkgbase, err)
log.Warningf("Failed to sign %s (%s): %s", pkg.Pkgbase, err, string(res))
b.buildWG.Done()
continue
}
@@ -228,7 +227,7 @@ func (b *BuildManager) buildWorker(id int, march string) {
check(err)
for _, file := range copyFiles {
check(os.MkdirAll(filepath.Join(conf.Basedir.Work, waitingDir, pkg.FullRepo), 755))
check(os.MkdirAll(filepath.Join(conf.Basedir.Work, waitingDir, pkg.FullRepo), 0755))
_, err = copyFile(file, filepath.Join(conf.Basedir.Work, waitingDir, pkg.FullRepo, filepath.Base(file)))
if err != nil {
check(err)
@@ -744,10 +743,12 @@ func (b *BuildManager) syncWorker() {
b.parseWG.Wait()
b.buildWG.Wait()
for _, repo := range repos {
err = movePackagesLive(repo)
if err != nil {
log.Errorf("[%s] Error moving packages live: %v", repo, err)
if !b.exit {
for _, repo := range repos {
err = movePackagesLive(repo)
if err != nil {
log.Errorf("[%s] Error moving packages live: %v", repo, err)
}
}
}