ALHP/ALHP.GO
6
42
Fork 9
Code Issues 25 Pull Requests Projects Releases Wiki Activity

remove blacklisted packages if still part of repo

Browse Source
This commit is contained in:
Giovanni Harting
2023-12-13 03:23:56 +01:00
parent 8c148c6e89
commit 16fcf0117d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
housekeeping.go
View File

@@ -57,8 +57,12 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
buildManager.alpmMutex.Lock() buildManager.alpmMutex.Lock()
pkgResolved, err := dbs.FindSatisfier(mPackage.Name()) pkgResolved, err := dbs.FindSatisfier(mPackage.Name())
buildManager.alpmMutex.Unlock() buildManager.alpmMutex.Unlock()
if err != nil || pkgResolved.DB().Name() != pkg.DBPackage.Repository.String() || pkgResolved.DB().Name() != pkg.Repo.String() || if err != nil ||
pkgResolved.Architecture() != pkg.Arch || pkgResolved.Name() != mPackage.Name() { pkgResolved.DB().Name() != pkg.DBPackage.Repository.String() ||
pkgResolved.DB().Name() != pkg.Repo.String() ||
pkgResolved.Architecture() != pkg.Arch ||
pkgResolved.Name() != mPackage.Name() ||
Contains(conf.Blacklist.Packages, pkg.Pkgbase) {
switch { switch {
case pkgResolved.DB().Name() != pkg.DBPackage.Repository.String(): case pkgResolved.DB().Name() != pkg.DBPackage.Repository.String():
@@ -69,6 +73,8 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
log.Infof("[HK] %s->%s not included in repo (arch mismatch: repo:%s != pkg:%s)", pkg.FullRepo, mPackage.Name(), pkgResolved.Architecture(), pkg.Arch) log.Infof("[HK] %s->%s not included in repo (arch mismatch: repo:%s != pkg:%s)", pkg.FullRepo, mPackage.Name(), pkgResolved.Architecture(), pkg.Arch)
case pkgResolved.Name() != mPackage.Name(): case pkgResolved.Name() != mPackage.Name():
log.Infof("[HK] %s->%s not included in repo (name mismatch: repo:%s != pkg:%s)", pkg.FullRepo, mPackage.Name(), pkgResolved.Name(), mPackage.Name()) log.Infof("[HK] %s->%s not included in repo (name mismatch: repo:%s != pkg:%s)", pkg.FullRepo, mPackage.Name(), pkgResolved.Name(), mPackage.Name())
case Contains(conf.Blacklist.Packages, pkg.Pkgbase):
log.Infof("[HK] %s->%s not included in repo (blacklisted pkgbase %s)", pkg.FullRepo, mPackage.Name(), pkg.Pkgbase)
default: default:
log.Infof("[HK] %s->%s not included in repo (resolve error: %v)", pkg.FullRepo, mPackage.Name(), err) log.Infof("[HK] %s->%s not included in repo (resolve error: %v)", pkg.FullRepo, mPackage.Name(), err)
} }