Merge pull request #374 from wking/flatten-if-changed

pkg/cvo/sync_worker: Flatten a nested 'if changed'
openshift · Jun 2, 2020 · d2cc0d0 · d2cc0d0
2 parents e43c031 + 2131612
commit d2cc0d0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/cvo/sync_worker.go b/pkg/cvo/sync_worker.go
@@ -384,10 +384,8 @@ func (w *SyncWorker) calculateNext(work *SyncWork) bool {
 	// the state Update() calculated (to allow us to start in reconciling)
 	if work.Empty() {
 		work.State = w.work.State
-	} else {
-		if changed {
-			work.State = payload.UpdatingPayload
-		}
+	} else if changed {
+		work.State = payload.UpdatingPayload
 	}
 	// always clear the completed variable if we are not reconciling
 	if work.State != payload.ReconcilingPayload {