From 8fe88b78e3d8b3462a3a27a49e4e72456d71f9ad Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Wed, 4 Jun 2014 11:20:52 +0100 Subject: Move presence check for job into remove function We always want to warn if we attempt to remove a job that's not present --- distbuild/worker_build_scheduler.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'distbuild') diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 8caf5511..57cc0224 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -120,18 +120,18 @@ class Jobs(object): return job def remove(self, job): - del self._jobs[job.artifact.basename()] + if job.artifact.basename() in self._jobs: + del self._jobs[job.artifact.basename()] + else: + logging.warning("Tried to remove a job that doesn't exist " + "(%s)", job.artifact.basename()) def get_jobs(self): return self._jobs def remove_jobs(self, jobs): for job in jobs: - if job.artifact.basename() in self._jobs: - self.remove(job) - else: - logging.warning("Tried to remove a job that doesn't exist " - "(%s)", job.artifact.basename()) + self.remove(job) def exists(self, artifact_basename): return artifact_basename in self._jobs -- cgit v1.2.1