From 2791ed44fa8b26dc47145d5158c7b6900faf74ba Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 22 Jun 2022 14:11:52 +0200 Subject: [PATCH] improved debug logging in mirror check --- proto_package.go | 5 +++-- utils.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proto_package.go b/proto_package.go index d6d33b7..6113f72 100644 --- a/proto_package.go +++ b/proto_package.go @@ -559,21 +559,22 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool { var pkg alpm.IPackage if p.Srcinfo != nil { pkg, err = dbs.FindSatisfier(p.Srcinfo.Packages[0].Pkgname) - log.Debugf("trying to find %s on mirror", p.Srcinfo.Packages[0].Pkgname) } else { pkg, err = dbs.FindSatisfier(p.DbPackage.Packages[0]) - log.Debugf("trying to find %s on mirror", p.DbPackage.Packages[0]) } buildManager.alpmMutex.Unlock() if err != nil { + log.Debugf("error resolving %s: %v", p.Pkgbase, err) return false } if pkg.DB().Name() != p.Repo.String() || pkg.Base() != p.Pkgbase { + log.Debugf("%s: repo (%s!=%s) or pkgbase (%s!=%s) does not match", p.Pkgbase, pkg.DB().Name(), p.Repo.String(), pkg.Base(), p.Pkgbase) return false } if p.Srcinfo != nil && (p.Srcinfo.Arch[0] != pkg.Architecture() || p.Srcinfo.Pkgbase != pkg.Base()) { + log.Debugf("%s: arch (%s!=%s) or pkgbase (%s!=%s) does not match", p.Pkgbase, p.Srcinfo.Arch[0], pkg.Architecture(), pkg.Base(), p.Pkgbase) return false } diff --git a/utils.go b/utils.go index b3d3bca..184800c 100644 --- a/utils.go +++ b/utils.go @@ -615,7 +615,7 @@ func housekeeping(repo string, march string, wg *sync.WaitGroup) error { pkg := &ProtoPackage{ Pkgbase: dbPkg.Pkgbase, Repo: dbPkg.Repository, - FullRepo: string(dbPkg.Repository) + "-" + dbPkg.March, + FullRepo: dbPkg.Repository.String() + "-" + dbPkg.March, DbPackage: dbPkg, March: dbPkg.March, }