particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/depsolve/cloudapi: Add 3rd-party repository support.

Browse source 
Allow 3rd-party repositories to be supported and custom packages installed.
Fixes #COMPOSER-1273
This commit is contained in:
Djebran Lezzoum 2021-12-06 17:33:07 +01:00 • committed by Sanne Raymaekers
parent 10f34de88b
commit c93ea748a2
17 changed files with 196 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -11,12 +11,17 @@ type DepsolveJobImpl struct {
RPMMDCache string
}
func (impl *DepsolveJobImpl) depsolve(packageSets map[string]rpmmd.PackageSet, repos []rpmmd.RepoConfig, modulePlatformID, arch, releasever string) (map[string][]rpmmd.PackageSpec, error) {
func (impl *DepsolveJobImpl) depsolve(packageSets map[string]rpmmd.PackageSet, repos []rpmmd.RepoConfig, modulePlatformID, arch, releasever string, packageSetsRepositories map[string][]rpmmd.RepoConfig) (map[string][]rpmmd.PackageSpec, error) {
rpmMD := rpmmd.NewRPMMD(impl.RPMMDCache)
packageSpecs := make(map[string][]rpmmd.PackageSpec)
for name, packageSet := range packageSets {
packageSpec, _, err := rpmMD.Depsolve(packageSet, repos, modulePlatformID, arch, releasever)
repositories := make([]rpmmd.RepoConfig, len(repos))
copy(repositories, repos)
if packageSetRepositories, ok := packageSetsRepositories[name]; ok {
repositories = append(repositories, packageSetRepositories...)
}
packageSpec, _, err := rpmMD.Depsolve(packageSet, repositories, modulePlatformID, arch, releasever)
if err != nil {
return nil, err
}
@ -33,7 +38,7 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error {
}
var result worker.DepsolveJobResult
result.PackageSpecs, err = impl.depsolve(args.PackageSets, args.Repos, args.ModulePlatformID, args.Arch, args.Releasever)
result.PackageSpecs, err = impl.depsolve(args.PackageSets, args.Repos, args.ModulePlatformID, args.Arch, args.Releasever, args.PackageSetsRepositories)
if err != nil {
switch err.(type) {
case *rpmmd.DNFError: