strptrk/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Pull Requests Activity

take current repo into account if searching for dbpackage

Browse Source
This commit is contained in:
Giovanni Harting
2021-12-07 09:07:29 +01:00
parent 86f76d0bce
commit b4670b5cce
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils.go
View File

@@ -613,7 +613,7 @@ func setupChroot() error {
return nil return nil
} }
func (path PKGFile) DBPackage(march string) (*ent.DbPackage, error) { func (path PKGFile) DBPackage(march string, repo dbpackage.Repository) (*ent.DbPackage, error) {
fNameSplit := strings.Split(filepath.Base(string(path)), "-") fNameSplit := strings.Split(filepath.Base(string(path)), "-")
pkgname := strings.Join(fNameSplit[:len(fNameSplit)-3], "-") pkgname := strings.Join(fNameSplit[:len(fNameSplit)-3], "-")
@@ -621,7 +621,8 @@ func (path PKGFile) DBPackage(march string) (*ent.DbPackage, error) {
s.Where( s.Where(
sql.And( sql.And(
sqljson.ValueContains(dbpackage.FieldPackages, pkgname), sqljson.ValueContains(dbpackage.FieldPackages, pkgname),
sql.EQ(dbpackage.FieldMarch, march)), sql.EQ(dbpackage.FieldMarch, march),
sql.EQ(dbpackage.FieldRepository, repo)),
) )
}).Only(context.Background()) }).Only(context.Background())
if err != nil { if err != nil {
@@ -663,8 +664,9 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
pkgfile := PKGFile(path) pkgfile := PKGFile(path)
splitPath := strings.Split(path, string(filepath.Separator)) splitPath := strings.Split(path, string(filepath.Separator))
march := strings.Join(strings.Split(splitPath[len(splitPath)-4], "-")[1:], "-") march := strings.Join(strings.Split(splitPath[len(splitPath)-4], "-")[1:], "-")
mRepo := dbpackage.Repository(strings.Split(splitPath[len(splitPath)-4], "-")[0])
dbPkg, err := pkgfile.DBPackage(march) dbPkg, err := pkgfile.DBPackage(march, mRepo)
if err != nil { if err != nil {
log.Infof("[HK/%s] removing orphan %s", repo, filepath.Base(path)) log.Infof("[HK/%s] removing orphan %s", repo, filepath.Base(path))
pkg := &BuildPackage{ pkg := &BuildPackage{
@@ -678,7 +680,7 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
pkg := &BuildPackage{ pkg := &BuildPackage{
Pkgbase: dbPkg.Pkgbase, Pkgbase: dbPkg.Pkgbase,
Repo: dbpackage.Repository(strings.Split(splitPath[len(splitPath)-4], "-")[0]), Repo: mRepo,
FullRepo: splitPath[len(splitPath)-4], FullRepo: splitPath[len(splitPath)-4],
DbPackage: dbPkg, DbPackage: dbPkg,
March: march, March: march,
@@ -766,7 +768,7 @@ func (p *BuildPackage) findPkgFiles() error {
} }
func (p *BuildPackage) toDbPackage(create bool) { func (p *BuildPackage) toDbPackage(create bool) {
dbPkg, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March))).Only(context.Background()) dbPkg, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March), dbpackage.RepositoryEQ(p.Repo))).Only(context.Background())
if err != nil && create { 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()) dbPkg = db.DbPackage.Create().SetPkgbase(p.Pkgbase).SetMarch(p.March).SetPackages(packages2slice(p.Srcinfo.Packages)).SetRepository(p.Repo).SaveX(context.Background())
} }