From 8807cbc7305e424725b2be8eed7ecd9234f7772e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 19 May 2026 00:03:42 +0900 Subject: internal/rosa: create metadata alongside artifact This enables deferring evaluation of azalea-based packages and fixes the longstanding quirk of version being disjoint from other metadata. Signed-off-by: Ophestra --- internal/rosa/rosa.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'internal/rosa/rosa.go') diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index b29fd605..dde85e00 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -249,7 +249,7 @@ func (t Toolchain) New( support = append(support, extra...) support = append(support, cureEtc{}) if t.stage == stageEarly { - a, _ := t.Load(stage0Dist) + _, a := t.MustLoad(stage0Dist) support = append(support, a) } else { support = append(support, t.S.New(_stageBusybox).New("gentoo", 0, nil, nil, nil, ` @@ -438,10 +438,11 @@ func (t Toolchain) appendHandle(a []pkg.Artifact, pv pa, p ArtifactH) []pkg.Arti } pv[p] = struct{}{} - for _, d := range t.MustGet(p).Dependencies { + meta, _ := t.MustLoad(p) + for _, d := range meta.Dependencies { a = t.appendHandle(a, pv, d) } - d, _ := t.Load(p) + _, d := t.MustLoad(p) return append(a, d) } -- cgit v1.3.1