From c8b31b327566bc057352f3f9e9e113e910320f79 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 13 Aug 2022 22:27:56 +0200 Subject: [PATCH] added more db-based lookups --- main.go | 1 - proto_package.go | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 3ae47b2..294419d 100644 --- a/main.go +++ b/main.go @@ -394,7 +394,6 @@ func (b *BuildManager) refreshSRCINFOs(ctx context.Context, path string) error { } wg.Wait() - return nil } diff --git a/proto_package.go b/proto_package.go index 6063bc3..e7a34b9 100644 --- a/proto_package.go +++ b/proto_package.go @@ -640,11 +640,16 @@ func (p *ProtoPackage) SVN2GITVersion(h *alpm.Handle) (string, error) { return "", MultiplePKGBUILDError{fmt.Errorf("%s: multiple PKGBUILD found: %s", p.Pkgbase, fPkgbuilds)} } log.Infof("%s: resolving successful: MirrorRepo=%s; PKGBUILD chosen: %s", p.Pkgbase, iPackage.DB().Name(), fPkgbuilds[0]) - p.Repo = dbpackage.Repository(iPackage.DB().Name()) } else if len(fPkgbuilds) == 0 { return "", fmt.Errorf("%s: no matching PKGBUILD found (searched: %s, canidates: %s)", p.Pkgbase, filepath.Join(conf.Basedir.Work, upstreamDir, "**/"+p.Pkgbase+"/repos/*/PKGBUILD"), pkgBuilds) } + pPkg := PKGBUILD(fPkgbuilds[0]) + dbPkg, err := db.DbPackage.Query().Where(dbpackage.RepositoryEQ(dbpackage.Repository(pPkg.Repo())), dbpackage.March(p.March), dbpackage.Pkgbase(p.Pkgbase)).Only(context.Background()) + if err == nil { + return dbPkg.Version, nil + } + cmd := exec.Command("makepkg", "--printsrcinfo") cmd.Dir = filepath.Dir(fPkgbuilds[0]) res, err := cmd.Output()