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

rcm/depsolve: take ImageType as argumnet rather than strings

Browse source 
Use the already resolved real object, and avoid having to resolve
and error-check again.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-03-22 20:55:28 +01:00 • committed by msehnout
parent 1597ae2ed6
commit 7d4ad6b649
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/rcm/api.go
View file

@ -83,22 +83,14 @@ func notFoundHandler(writer http.ResponseWriter, request *http.Request) {
// Depsolves packages and build packages for building an image for a given
// distro, in the given architecture
func depsolve(rpmmd rpmmd.RPMMD, distro distro.Distro, repos []rpmmd.RepoConfig, imageType, arch string) ([]rpmmd.PackageSpec, []rpmmd.PackageSpec, error) {
specs, excludeSpecs, err := distro.BasePackages(imageType, arch)
if err != nil {
return nil, nil, fmt.Errorf("Distro.BasePackages: %v", err)
}
func depsolve(rpmmd rpmmd.RPMMD, distro distro.Distro, imageType distro.ImageType, repos []rpmmd.RepoConfig) ([]rpmmd.PackageSpec, []rpmmd.PackageSpec, error) {
specs, excludeSpecs := imageType.BasePackages()
packages, _, err := rpmmd.Depsolve(specs, excludeSpecs, repos, distro.ModulePlatformID())
if err != nil {
return nil, nil, fmt.Errorf("RPMMD.Depsolve: %v", err)
}
specs, err = distro.BuildPackages(arch)
if err != nil {
return nil, nil, fmt.Errorf("Distro.BuildPackages: %v", err)
}
specs = imageType.BuildPackages()
buildPackages, _, err := rpmmd.Depsolve(specs, nil, repos, distro.ModulePlatformID())
if err != nil {
return nil, nil, fmt.Errorf("RPMMD.Depsolve: %v", err)
@ -203,7 +195,7 @@ func (api *API) submit(writer http.ResponseWriter, request *http.Request, _ http
})
}
packages, buildPackages, err := depsolve(api.rpmMetadata, distro, repoConfigs, imageType.Name(), arch.Name())
packages, buildPackages, err := depsolve(api.rpmMetadata, distro, imageType, repoConfigs)
if err != nil {
writer.WriteHeader(http.StatusBadRequest)
_, err := writer.Write([]byte(err.Error()))