Move presence check for job into remove function

We always want to warn if we attempt to remove a job that's not present

1 files changed, 6 insertions, 6 deletions

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