From f1e4ef1611931f2ca5fa7f348171269fa593c9d8 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 1 Feb 2023 17:35:58 -0800 Subject: Simplufy shouldRefresh* checks In comments on I3824af6149bf27c41a8d895fc682236bd0d91f6b Clark Boylan suggested that an equality check of the version number might be a simpler and more robust way of checking that an object should be refreshed. This change implements that suggestion. Change-Id: I9261fc68442e4002c4579db4f99d3c151ffd485c --- zuul/model.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/zuul/model.py b/zuul/model.py index f8330f21c..2ab22a1df 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -4411,19 +4411,15 @@ class BuildSet(zkobject.ZKObject): if (COMPONENT_REGISTRY.model_api < 12): return True current = build.getZKVersion() - if current is None: - current = -1 expected = self.build_versions.get(build.uuid, 0) - return expected > current + return expected != current def shouldRefreshJob(self, job): if (COMPONENT_REGISTRY.model_api < 12): return True current = job.getZKVersion() - if current is None: - current = -1 expected = self.job_versions.get(job.name, 0) - return expected > current + return expected != current @property def ref(self): -- cgit v1.2.1