From 8ba3426f12690083dee3999a9dbfeff4fdb3a955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Wed, 10 Jan 2024 22:10:22 +0100 Subject: [PATCH] composer: use distro name aliases from configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Register the distro name aliases from the configuration on the distro factory. Signed-off-by: Tomáš Hozza --- cmd/osbuild-composer/composer.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/osbuild-composer/composer.go b/cmd/osbuild-composer/composer.go index 6a6e65551..9be419a16 100644 --- a/cmd/osbuild-composer/composer.go +++ b/cmd/osbuild-composer/composer.go @@ -69,9 +69,10 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos } c.distros = distrofactory.NewDefault() - // TODO: set the c.config.DistroAliases to the distrofactory - // More work is needed to make the distro aliases behavior consistent for Weldr API, - // specifically for picking the correct repositories definition. + err = c.distros.RegisterAliases(config.DistroAliases) + if err != nil { + return nil, fmt.Errorf("failed to configure distro aliases: %v", err) + } c.solver = dnfjson.NewBaseSolver(path.Join(c.cacheDir, "rpmmd")) c.solver.SetDNFJSONPath(c.config.DNFJson)