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

fixed housekeeping was not march aware

Browse Source
This commit is contained in:
Giovanni Harting
2021-11-29 15:59:45 +01:00
parent 23a0fddea3
commit d65cab3303
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils.go
View File

@@ -609,11 +609,11 @@ func setupChroot() error {
return nil return nil
} }
func (path PKGFile) DBPackage() (*ent.DbPackage, error) { func (path PKGFile) DBPackage(march string) (*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], "-")
dbPkgs, err := db.DbPackage.Query().Where(dbpackage.PackagesNotNil()).All(context.Background()) dbPkgs, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.PackagesNotNil(), dbpackage.March(march))).All(context.Background())
if err != nil { if err != nil {
switch err.(type) { switch err.(type) {
case *ent.NotFoundError: case *ent.NotFoundError:
@@ -661,13 +661,15 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
for _, path := range packages { for _, path := range packages {
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:], "-")
dbPkg, err := pkgfile.DBPackage() dbPkg, err := pkgfile.DBPackage(march)
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{
FullRepo: splitPath[len(splitPath)-4], FullRepo: splitPath[len(splitPath)-4],
PkgFiles: []string{path}, PkgFiles: []string{path},
March: march,
} }
buildManager.repoPurge[pkg.FullRepo] <- pkg buildManager.repoPurge[pkg.FullRepo] <- pkg
continue continue
@@ -678,6 +680,7 @@ func housekeeping(repo string, wg *sync.WaitGroup) error {
Repo: dbpackage.Repository(strings.Split(splitPath[len(splitPath)-4], "-")[0]), Repo: dbpackage.Repository(strings.Split(splitPath[len(splitPath)-4], "-")[0]),
FullRepo: splitPath[len(splitPath)-4], FullRepo: splitPath[len(splitPath)-4],
DbPackage: dbPkg, DbPackage: dbPkg,
March: march,
} }
var upstream string var upstream string