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

DepsolveJob: rename struct field for consistency

Browse source 
We have two fields, `Repos` and `PackageSets`.  Renaming
`PackageSetsRepositories` to `PackageSetsRepos` for consistency.
The struct is for internal use only so the rename has no impact as long
as the serialised name is the same (json tag).

Also it's shorter.

Added docstring to the struct that explains the arguments in the same
way as they are described for the `depsolve()` function.

Changing the name of the argument in the internal `depsolve()` function
for the same reasons.
This commit is contained in:
Achilleas Koutsou 2022-01-31 20:06:48 +01:00 • committed by Christian Kellner
parent 70f83775b2
commit 82eedf5b82
3 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/cloudapi/v2/v2.go
View file

@ -498,12 +498,12 @@ func enqueueCompose(workers *worker.Server, distribution distro.Distro, bp bluep
ir := irs[0]
depsolveJobID, err := workers.EnqueueDepsolve(&worker.DepsolveJob{
PackageSets: ir.imageType.PackageSets(bp),
Repos: ir.repositories,
ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(),
Releasever: distribution.Releasever(),
PackageSetsRepositories: ir.packageSetsRepositories,
PackageSets: ir.imageType.PackageSets(bp),
Repos: ir.repositories,
ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(),
Releasever: distribution.Releasever(),
PackageSetsRepos: ir.packageSetsRepositories,
})
if err != nil {
return id, HTTPErrorWithInternal(ErrorEnqueueingJob, err)
@ -550,12 +550,12 @@ func enqueueKojiCompose(workers *worker.Server, taskID uint64, server, name, ver
var buildIDs []uuid.UUID
for _, ir := range irs {
depsolveJobID, err := workers.EnqueueDepsolve(&worker.DepsolveJob{
PackageSets: ir.imageType.PackageSets(bp),
Repos: ir.repositories,
ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(),
Releasever: distribution.Releasever(),
PackageSetsRepositories: ir.packageSetsRepositories,
PackageSets: ir.imageType.PackageSets(bp),
Repos: ir.repositories,
ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(),
Releasever: distribution.Releasever(),
PackageSetsRepos: ir.packageSetsRepositories,
})
if err != nil {
return id, HTTPErrorWithInternal(ErrorEnqueueingJob, err)