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

added removing repo version of blacklisted packages to housekeeping

Browse Source
This commit is contained in:
Giovanni Harting
2022-08-16 16:56:33 +02:00
parent ba8d02927f
commit b0d570363f
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
utils.go
View File

@@ -650,46 +650,52 @@ func housekeeping(repo string, march string, wg *sync.WaitGroup) error {
if err != nil { if err != nil {
return err return err
} }
} else if dbPkg.Status == dbpackage.StatusSkipped && dbPkg.RepoVersion != "" && strings.HasPrefix(dbPkg.SkipReason, "blacklisted") {
log.Infof("[HK] delete blacklisted package %s", dbPkg.Pkgbase)
pkg := &ProtoPackage{
FullRepo: fullRepo,
March: march,
DbPackage: dbPkg,
}
buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
} }
} }
/* // check packages for eligibility
// check queued packages for eligibility log.Debugf("[HK/%s] check queued packages", fullRepo)
log.Debugf("[HK/%s] check queued packages", fullRepo) qPackages, err := db.DbPackage.Query().Where(
qPackages, err := db.DbPackage.Query().Where( dbpackage.And(
dbpackage.And( dbpackage.RepositoryEQ(dbpackage.Repository(repo)),
dbpackage.RepositoryEQ(dbpackage.Repository(repo)), dbpackage.March(march),
dbpackage.March(march), dbpackage.StatusEQ(dbpackage.StatusQueued),
dbpackage.StatusEQ(dbpackage.StatusQueued), )).All(context.Background())
)).All(context.Background()) if err != nil {
return err
}
for _, dbPkg := range qPackages {
pkg := &ProtoPackage{
Pkgbase: dbPkg.Pkgbase,
Repo: dbPkg.Repository,
FullRepo: dbPkg.Repository.String() + "-" + dbPkg.March,
DbPackage: dbPkg,
March: dbPkg.March,
}
var upstream string
switch pkg.DbPackage.Repository {
case dbpackage.RepositoryCore, dbpackage.RepositoryExtra:
upstream = "upstream-core-extra"
case dbpackage.RepositoryCommunity:
upstream = "upstream-community"
}
pkg.Pkgbuild = filepath.Join(conf.Basedir.Work, upstreamDir, upstream, dbPkg.Pkgbase, "repos", pkg.DbPackage.Repository.String()+"-"+conf.Arch, "PKGBUILD")
_, err := pkg.isEligible(context.Background())
if err != nil { if err != nil {
return err log.Warningf("[HK/%s] unable to determine status for %s: %v", fullRepo, dbPkg.Pkgbase, err)
} }
}
for _, dbPkg := range qPackages {
pkg := &ProtoPackage{
Pkgbase: dbPkg.Pkgbase,
Repo: dbPkg.Repository,
FullRepo: dbPkg.Repository.String() + "-" + dbPkg.March,
DbPackage: dbPkg,
March: dbPkg.March,
}
var upstream string
switch pkg.DbPackage.Repository {
case dbpackage.RepositoryCore, dbpackage.RepositoryExtra:
upstream = "upstream-core-extra"
case dbpackage.RepositoryCommunity:
upstream = "upstream-community"
}
pkg.Pkgbuild = filepath.Join(conf.Basedir.Work, upstreamDir, upstream, dbPkg.Pkgbase, "repos", pkg.DbPackage.Repository.String()+"-"+conf.Arch, "PKGBUILD")
_, err := pkg.isEligible(context.Background())
if err != nil {
log.Warningf("[HK/%s] unable to determine status for %s: %v", fullRepo, dbPkg.Pkgbase, err)
}
}
*/
log.Debugf("[HK/%s] all tasks finished", fullRepo) log.Debugf("[HK/%s] all tasks finished", fullRepo)
return nil return nil