From 24f275877ce7cd7d2472c7d2f9c1d32165dadd5c Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Mon, 29 Nov 2021 13:29:43 +0100
Subject: [PATCH] fixed some multi-march issues

---
 main.go  | 10 +++++-----
 utils.go |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.go b/main.go
index fcc9ff8..3b6f569 100644
--- a/main.go
+++ b/main.go
@@ -143,8 +143,8 @@ func (b *BuildManager) buildWorker(id int, march string) {
 
 				log.Warningf("[%s/%s/%s] Build failed (%d)", pkg.FullRepo, pkg.Pkgbase, pkg.Version, cmd.ProcessState.ExitCode())
 
-				check(os.MkdirAll(filepath.Join(conf.Basedir.Repo, "logs"), 0755))
-				check(os.WriteFile(filepath.Join(conf.Basedir.Repo, "logs", pkg.Pkgbase+".log"), out.Bytes(), 0644))
+				check(os.MkdirAll(filepath.Join(conf.Basedir.Repo, logDir, march), 0755))
+				check(os.WriteFile(filepath.Join(conf.Basedir.Repo, logDir, march, pkg.Pkgbase+".log"), out.Bytes(), 0644))
 
 				pkg.DbPackage.Update().SetStatus(dbpackage.StatusFailed).ClearSkipReason().SetBuildTimeStart(start).SetBuildTimeEnd(time.Now().UTC()).SetHash(pkg.Hash).ExecX(context.Background())
 
@@ -194,8 +194,8 @@ func (b *BuildManager) buildWorker(id int, march string) {
 				}
 			}
 
-			if _, err := os.Stat(filepath.Join(conf.Basedir.Repo, "logs", pkg.Pkgbase+".log")); err == nil {
-				check(os.Remove(filepath.Join(conf.Basedir.Repo, "logs", pkg.Pkgbase+".log")))
+			if _, err := os.Stat(filepath.Join(conf.Basedir.Repo, logDir, march, pkg.Pkgbase+".log")); err == nil {
+				check(os.Remove(filepath.Join(conf.Basedir.Repo, logDir, march, pkg.Pkgbase+".log")))
 			}
 
 			if pkg.DbPackage.Lto != dbpackage.LtoDisabled && pkg.DbPackage.Lto != dbpackage.LtoAutoDisabled {
@@ -407,7 +407,7 @@ func (b *BuildManager) htmlWorker() {
 					}
 
 					if pkg.Status == dbpackage.StatusFailed {
-						addPkg.Log = fmt.Sprintf("logs/%s.log", pkg.Pkgbase)
+						addPkg.Log = fmt.Sprintf("%s/%s/%s.log", logDir, pkg.March, pkg.Pkgbase)
 					}
 
 					switch pkg.Lto {
diff --git a/utils.go b/utils.go
index dc1d385..d7cc86a 100644
--- a/utils.go
+++ b/utils.go
@@ -732,7 +732,7 @@ func (p *BuildPackage) findPkgFiles() error {
 }
 
 func (p *BuildPackage) toDbPackage(create bool) {
-	dbPkg, err := db.DbPackage.Query().Where(dbpackage.Pkgbase(p.Pkgbase)).Only(context.Background())
+	dbPkg, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March))).Only(context.Background())
 	if err != nil && create {
 		dbPkg = db.DbPackage.Create().SetPkgbase(p.Pkgbase).SetMarch(p.March).SetPackages(packages2slice(p.Srcinfo.Packages)).SetRepository(p.Repo).SaveX(context.Background())
 	}