Skip to content

Fix wildcard version resolution #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thelovekesh wants to merge 1 commit into from
Closed

Fix wildcard version resolution #247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/pm/resolution/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,16 @@ func (r *Resolver) seedQueue() []dependencyRequest {
return queue
}

// dedupeRequests drops requests already satisfied at the same version
func satisfies(spec, version string) bool {
return spec == "*" || spec == version
}

// dedupeRequests drops requests already satisfied by a resolved package
// and folds identical name@version pairs in this iteration into one entry.
func dedupeRequests(queue []dependencyRequest, resolved map[string]Node) map[string]dependencyRequest {
uniqueRequests := make(map[string]dependencyRequest)
for _, req := range queue {
if exists, ok := resolved[req.name]; ok && exists.Version == req.version {
if exists, ok := resolved[req.name]; ok && satisfies(req.version, exists.Version) {
continue
}
uniqueRequests[req.name+"@"+req.version] = req
Expand Down Expand Up @@ -158,7 +162,7 @@ func (r *Resolver) fetchAll(ctx context.Context, requests map[string]dependencyR
// returning any newly discovered child dependencies to enqueue.
func (r *Resolver) applyResult(res fetchResult, resolved map[string]Node) ([]dependencyRequest, error) {
if existing, ok := resolved[res.req.name]; ok {
if existing.Version == res.req.version {
if satisfies(res.req.version, existing.Version) {
return nil, nil
}
if err := r.resolveConflict(res.req, existing); err != nil {
Expand Down Expand Up @@ -336,7 +340,7 @@ func (r *Resolver) fetchMetadata(ctx context.Context, name, version string) (*ma
// Try to resolve the manifest from lockfile first
if r.lockfile != nil && r.lockfile.Packages != nil {
if lockPkg, ok := r.lockfile.Packages[name]; ok {
if lockPkg.Version == version {
if satisfies(version, lockPkg.Version) {
return &manifest.Package{
Name: name,
Version: lockPkg.Version,
Expand Down
Loading