Merge "Remove unecessary finally clauses"

This commit is contained in:
Zuul 2019-01-03 23:00:23 +00:00 committed by Gerrit Code Review
commit 3f03cf43b9
2 changed files with 5 additions and 7 deletions

View File

@ -437,10 +437,9 @@ class PipelineManager(object):
except Exception:
self.log.exception("Exception while canceling build %s "
"for change %s" % (build, item.change))
finally:
tenant = old_build_set.item.pipeline.tenant
tenant.semaphore_handler.release(
old_build_set.item, build.job)
tenant = old_build_set.item.pipeline.tenant
tenant.semaphore_handler.release(
old_build_set.item, build.job)
if not was_running:
nodeset = build.build_set.getJobNodeSet(build.job.name)

View File

@ -837,9 +837,8 @@ class Scheduler(threading.Thread):
self.log.exception(
"Exception while removing nodeset from build %s "
"for change %s" % (build, build.build_set.item.change))
finally:
tenant.semaphore_handler.release(
build.build_set.item, build.job)
tenant.semaphore_handler.release(
build.build_set.item, build.job)
def _reconfigureTenant(self, tenant):
# This is called from _doReconfigureEvent while holding the