Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

composer: use reporegistry.New() again (see PR#4378) #4582

Merged
merged 1 commit into from
Jan 29, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/osbuild-composer/composer.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,17 @@ 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)
}
// 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)
}
Expand Down
Loading