Merge pull request #474 from LalatenduMohanty/fix_comment_func_equalUpdate

openshift-merge-robot · web-flow · commit 032a81f0c78d · 2020-10-22T18:06:21.000-04:00
Fixing go doc for equalUpdate()
diff --git a/pkg/cvo/sync_worker.go b/pkg/cvo/sync_worker.go
@@ -429,12 +429,10 @@ func (w *SyncWorker) calculateNext(work *SyncWork) bool {
 	return changed
 }
 
-// equalUpdate returns true if two updates have the same image.
+// equalUpdate returns true if two updates are semantically equivalent.
+// It checks if the updates have have the same force and image values
 func equalUpdate(a, b configv1.Update) bool {
-	if a.Force != b.Force {
-		return false
-	}
-	return a.Image == b.Image
+	return a.Force == b.Force && a.Image == b.Image
 }
 
 // equalSyncWork returns true if a and b are equal.

Original file line number	Diff line number	Diff line change
`@@ -429,12 +429,10 @@ func (w SyncWorker) calculateNext(work SyncWork) bool {`
`429`	`429`	`return changed`
`430`	`430`	`}`
`431`	`431`
`432`		`-// equalUpdate returns true if two updates have the same image.`
	`432`	`+// equalUpdate returns true if two updates are semantically equivalent.`
	`433`	`+// It checks if the updates have have the same force and image values`
`433`	`434`	`func equalUpdate(a, b configv1.Update) bool {`
`434`		`- if a.Force != b.Force {`
`435`		`- return false`
`436`		`- }`
`437`		`- return a.Image == b.Image`
	`435`	`+ return a.Force == b.Force && a.Image == b.Image`
`438`	`436`	`}`
`439`	`437`
`440`	`438`	`// equalSyncWork returns true if a and b are equal.`