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

rpmmd/Depsolve: rely on the RepoID being the offset into the array

Browse source 
We don't have to go via a map, and also don't have to rely on the ID's
in the passed in repos are the same, by instead relying on RepoID being
the offset into the passed in repos array, as set in the previous patch.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-05-26 11:35:03 +02:00
parent 3edada6664
commit 00483101c6
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/rpmmd/repository.go
View file

@ -347,13 +347,9 @@ func (r *rpmmdImpl) FetchMetadata(repos []RepoConfig, modulePlatformID string, a
}
func (r *rpmmdImpl) Depsolve(specs, excludeSpecs []string, repos []RepoConfig, modulePlatformID, arch string) ([]PackageSpec, map[string]string, error) {
repoMap := make(map[string]RepoConfig)
var dnfRepoConfigs []dnfRepoConfig
for i, repo := range repos {
id := repo.Id
repoMap[id] = repo
dnfRepo, err := repo.toDNFRepoConfig(i)
if err != nil {
return nil, nil, err
@ -376,8 +372,11 @@ func (r *rpmmdImpl) Depsolve(specs, excludeSpecs []string, repos []RepoConfig, m
err := runDNF("depsolve", arguments, &reply)
for i, pack := range reply.Dependencies {
id := pack.RepoID
if repoMap[id].RHSM {
id, err := strconv.Atoi(pack.RepoID)
if err != nil {
panic(err)
}
if repos[id].RHSM {
reply.Dependencies[i].Secrets = "org.osbuild.rhsm"
}
}