From bc149cab3af044e1c445ed28c47a68e40dd6ad3d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jan 2025 10:48:15 +0100 Subject: [PATCH] composer: use `reporegistry.New()` again (see PR#4378) This commit changes cmd/composer to use the `reporegistry.New` call again. This is a preparation for https://github.com/osbuild/images/pull/1179 And undoes parts of https://github.com/osbuild/osbuild-composer/pull/4378 but that is no longer necessary because in https://github.com/osbuild/images/pull/946 the error is now passed on from `reporegistry.New()` in the same way as from `LoadRepositories()`. --- cmd/osbuild-composer/composer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/osbuild-composer/composer.go b/cmd/osbuild-composer/composer.go index 80654e14fc..a3caf18a40 100644 --- a/cmd/osbuild-composer/composer.go +++ b/cmd/osbuild-composer/composer.go @@ -77,8 +77,10 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos return nil, fmt.Errorf("failed to configure distro aliases: %v", err) } - repoConfigs, err := reporegistry.LoadAllRepositories(repositoryConfigs) + c.repos, err = reporegistry.New(repositoryConfigs) switch err.(type) { + case nil: + // fine case *reporegistry.NoReposLoadedError: if !c.config.IgnoreMissingRepos { return nil, fmt.Errorf("error loading repository definitions: %w", err) @@ -86,8 +88,6 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos // running without repositories is allowed: log message and continue logrus.Info(err.Error()) logrus.Info("ignore_missing_repos enabled: continuing") - case nil: - c.repos = reporegistry.NewFromDistrosRepoConfigs(repoConfigs) default: return nil, fmt.Errorf("error loading repository definitions: %w", err) }