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

generate srcinfo before building to make sure we have the latest version parsed

Browse Source
This commit is contained in:
Giovanni Harting
2023-05-17 16:23:44 +02:00
parent 6556d8ae16
commit 786b70b842
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proto_package.go
View File

@@ -146,23 +146,18 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
start := time.Now().UTC() start := time.Now().UTC()
chroot := "build_" + uuid.New().String() chroot := "build_" + uuid.New().String()
if p.Version == "" {
if p.Srcinfo == nil {
err := p.genSrcinfo() err := p.genSrcinfo()
if err != nil { if err != nil {
return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err) return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err)
} }
}
p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch) 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) log.Infof("[P] build starting: %s->%s->%s", p.FullRepo, p.Pkgbase, p.Version)
p.toDBPackage(true) p.toDBPackage(true)
p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(ctx) p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(ctx)
err := p.importKeys() err = p.importKeys()
if err != nil { if err != nil {
log.Warningf("[P] failed to import pgp keys for %s->%s->%s: %v", p.FullRepo, p.Pkgbase, p.Version, err) log.Warningf("[P] failed to import pgp keys for %s->%s->%s: %v", p.FullRepo, p.Pkgbase, p.Version, err)
} }