From 3e8f4711f0fca7de7176dfd7ca41b0da7ee1d742 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 19 Nov 2021 23:47:19 +0100 Subject: [PATCH] changed repoPurge to work without srcinfo --- main.go | 6 ++++-- utils.go | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 258ad75..66480f1 100644 --- a/main.go +++ b/main.go @@ -438,8 +438,10 @@ func (b *BuildManager) repoWorker(repo string) { } var realPkgs []string - for _, realPkg := range pkg.Srcinfo.Packages { - realPkgs = append(realPkgs, realPkg.Pkgname) + for _, filePath := range pkg.PkgFiles { + fNameSplit := strings.Split(filepath.Base(filePath), "-") + pkgname := strings.Join(fNameSplit[:len(fNameSplit)-3], "-") + realPkgs = append(realPkgs, pkgname) } b.repoWG.Add(1) diff --git a/utils.go b/utils.go index 12f861b..716ebc2 100644 --- a/utils.go +++ b/utils.go @@ -507,12 +507,7 @@ func housekeeping(repo string, wg *sync.WaitGroup) error { case dbpackage.RepositoryCommunity: upstream = "upstream-community" } - pkg.Pkgbuild = filepath.Join(conf.Basedir.Upstream, upstream, dbPkg.Pkgbase, "repos", dbPkg.Repository.String()+"-"+conf.Arch, "PKGBUILD") - if err = pkg.genSrcinfo(); err != nil { - log.Warningf("[HK/%s/%s] failed to gen sourceinfo: %v", repo, pkg.Pkgbase, err) - continue - } // check if pkg signature is valid valid, err := pkgfile.isSignatureValid() @@ -549,7 +544,7 @@ func housekeeping(repo string, wg *sync.WaitGroup) error { if err != nil { return err } - pkgResolved, err := dbs.FindSatisfier(pkg.Srcinfo.Packages[0].Pkgname) + pkgResolved, err := dbs.FindSatisfier(dbPkg.Packages[0]) if err != nil || pkgResolved.DB().Name() != dbPkg.Repository.String() { // package not found on mirror/db -> not part of any repo anymore log.Infof("[HK/%s/%s] not part of repo", pkg.FullRepo, pkg.Pkgbase)