From 786b70b8424531fe8619e961f86b222eff625af3 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 17 May 2023 16:23:44 +0200 Subject: [PATCH] generate srcinfo before building to make sure we have the latest version parsed --- proto_package.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/proto_package.go b/proto_package.go index e36d8c5..ff58d20 100644 --- a/proto_package.go +++ b/proto_package.go @@ -146,23 +146,18 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) { start := time.Now().UTC() chroot := "build_" + uuid.New().String() - if p.Version == "" { - if p.Srcinfo == nil { - err := p.genSrcinfo() - if err != nil { - return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err) - } - } - - p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch) + err := p.genSrcinfo() + if err != nil { + return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err) } + p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch) log.Infof("[P] build starting: %s->%s->%s", p.FullRepo, p.Pkgbase, p.Version) p.toDBPackage(true) p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(ctx) - err := p.importKeys() + err = p.importKeys() if err != nil { log.Warningf("[P] failed to import pgp keys for %s->%s->%s: %v", p.FullRepo, p.Pkgbase, p.Version, err) }