Merge pull request #486 from ankitathomas/skippatch-fix

openshift-merge-robot · web-flow · commit ec53e2370051 · 2020-10-23T13:38:44.000-04:00
Bug 1889721: Check prerelease version for semver-skippatch mode
diff --git a/pkg/registry/bundlegraphloader.go b/pkg/registry/bundlegraphloader.go
@@ -153,6 +153,9 @@ func (g *BundleGraphLoader) AddBundleToGraph(bundle *Bundle, graph *Package, ann
 	return graph, nil
 }
 
+// isSkipPatchCandidate returns true if version is equal to toCompare
+// in major and minor positions and strictly greater in all others,
+// indicating that toCompare can be skipped over to version.
 func isSkipPatchCandidate(version, toCompare semver.Version) bool {
-	return (version.Major == toCompare.Major) && (version.Minor == toCompare.Minor) && (version.Patch > toCompare.Patch)
+	return (version.Major == toCompare.Major) && (version.Minor == toCompare.Minor) && version.GT(toCompare)
 }

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,9 @@ func (g BundleGraphLoader) AddBundleToGraph(bundle Bundle, graph *Package, ann`
`153`	`153`	`return graph, nil`
`154`	`154`	`}`
`155`	`155`
	`156`	`+// isSkipPatchCandidate returns true if version is equal to toCompare`
	`157`	`+// in major and minor positions and strictly greater in all others,`
	`158`	`+// indicating that toCompare can be skipped over to version.`
`156`	`159`	`func isSkipPatchCandidate(version, toCompare semver.Version) bool {`
`157`		`- return (version.Major == toCompare.Major) && (version.Minor == toCompare.Minor) && (version.Patch > toCompare.Patch)`
	`160`	`+ return (version.Major == toCompare.Major) && (version.Minor == toCompare.Minor) && version.GT(toCompare)`
`158`	`161`	`}`