Skip to content

Commit

Permalink
Merge pull request containerd#45 from katiewasnothere/remove_osversio…
Browse files Browse the repository at this point in the history
…n_check

Remove check for osversion in windows matcher
  • Loading branch information
katiewasnothere authored May 20, 2022
2 parents b40fc0e + bd6aa6c commit bef61e0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions platforms/defaults_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ type matchComparer struct {
// Match matches platform with the same windows major, minor
// and build version.
func (m matchComparer) Match(p imagespec.Platform) bool {
if m.defaults.Match(p) {
// TODO(windows): Figure out whether OSVersion is deprecated.
return strings.HasPrefix(p.OSVersion, m.osVersionPrefix)
}
return false
return m.defaults.Match(p)
}

// Less sorts matched platforms in front of other platforms.
Expand Down

0 comments on commit bef61e0

Please sign in to comment.