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

Fix package name-version for wildcard version

Browse source 
If a package had version "*" and its name-version would be "name-*".
This would match all packages containing "name" in their name. Instead
the name-version is "name-*-*" so it matches any version of the package.
This commit is contained in:
Jacob Kozol 2019-09-25 15:37:00 +02:00 • committed by Lars Karlitski
parent 0861b80c99
commit e14c48ff61
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/weldr/api.go
View file

@ -443,11 +443,14 @@ func (api *API) blueprintsDepsolveHandler(writer http.ResponseWriter, request *h
specs := make([]string, len(blueprint.Packages)) specs := make([]string, len(blueprint.Packages))
for i, pkg := range blueprint.Packages { for i, pkg := range blueprint.Packages {
specs[i] = pkg.Name specs[i] = pkg.Name
if pkg.Version != "" { // If a package has version "*" the package name suffix must be equal to "-*-*.*"
// Using just "-*" would find any other package containing the package name
if pkg.Version != "" && pkg.Version != "*" {
specs[i] += "-" + pkg.Version specs[i] += "-" + pkg.Version
} else if pkg.Version == "*" {
specs[i] += "-*-*.*"
} }
} }
dependencies, _ := rpmmd.Depsolve(specs...) dependencies, _ := rpmmd.Depsolve(specs...)
blueprints = append(blueprints, entry{blueprint, dependencies}) blueprints = append(blueprints, entry{blueprint, dependencies})