From c33d8d98bdff982c35b7feba7bc3d8a38fc6f049 Mon Sep 17 00:00:00 2001 From: devfu Date: Thu, 3 Jun 2021 16:09:06 +0800 Subject: [PATCH] Update "if .. if .." to "if .. in .." Make the code structure looks more clear and more clean. Change-Id: I5cfce411d7cc182d3ac50170b2ea6a4bc2598525 --- freezer/scheduler/scheduler_job.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/freezer/scheduler/scheduler_job.py b/freezer/scheduler/scheduler_job.py index d640608b..e7a9151c 100644 --- a/freezer/scheduler/scheduler_job.py +++ b/freezer/scheduler/scheduler_job.py @@ -440,15 +440,13 @@ class Job(object): return for job_action in self.job_doc.get('job_actions', []): - if job_action.get('mandatory', False) or\ + if job_action.get('mandatory', False) or \ (result == Job.SUCCESS_RESULT): action_result = self.execute_job_action(job_action) - if action_result == Job.FAIL_RESULT: - result = Job.FAIL_RESULT + if action_result in [Job.FAIL_RESULT, Job.ABORTED_RESULT]: + result = action_result - if action_result == Job.ABORTED_RESULT: - result = Job.ABORTED_RESULT else: freezer_action = job_action.get('freezer_action', {}) action_name = freezer_action.get('action', '')